From 7edacde10fd26dbfde3aeaea1130daf2692297f6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Tue, 28 Aug 2012 14:37:48 +0000 Subject: [PATCH] Fix package provides and obsoletes for SL6 (platform specifix suffix everywhere). --- org.gridsite.core/src/make-gridsite-spec | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/org.gridsite.core/src/make-gridsite-spec b/org.gridsite.core/src/make-gridsite-spec index 983af49..1221fb6 100755 --- a/org.gridsite.core/src/make-gridsite-spec +++ b/org.gridsite.core/src/make-gridsite-spec @@ -18,12 +18,12 @@ fi if [ x"$project" = x"emi1" ]; then shared_name="shared" - shared_provide="libs" - shared_obsoletes="gridsite-libs < $PATCH_VERSION" + shared_provide_name="libs" + shared_obsoletes="gridsite-libs%{?_isa} < $PATCH_VERSION" else shared_name="libs" - shared_provide="shared" - shared_obsoletes="gridsite-shared <= $PATCH_VERSION" + shared_provide_name="shared" + shared_obsoletes="gridsite-shared%{?_isa} <= $PATCH_VERSION" fi # test to see if gsoap-devel (or stdsoap2.h and libgsoapssl) is installed @@ -65,10 +65,10 @@ Vendor: GridPP Buildrequires: libxml2-devel,curl-devel,httpd-devel,openssl-devel,pkgconfig Buildrequires: doxygen${gsoapdep}${fusedep}${globusdep} Packager: Andrew McNab -Provides: gridsite-apache = %{version}-%{release} -Obsoletes: gridsite-apache <= 1.7.21 -Provides: gridsite-services = %{version}-%{release} -Obsoletes: gridsite-services <= 1.7.21 +Provides: gridsite-apache%{?_isa} = %{version}-%{release} +Obsoletes: gridsite-apache%{?_isa} <= 1.7.21 +Provides: gridsite-services%{?_isa} = %{version}-%{release} +Obsoletes: gridsite-services%{?_isa} <= 1.7.21 %description GridSite adds GSI, VOMS and GACL support to Apache 2.0 (mod_gridsite), @@ -84,7 +84,7 @@ See http://www.gridsite.org/ for details. Group: Development/Libraries Summary: GridSite shared library and core documentation Obsoletes: $shared_obsoletes -Provides: gridsite-$shared_provide = %{version}-%{release} +Provides: gridsite-$shared_provide_name%{?_isa} = %{version}-%{release} %description $shared_name GridSite shared library and core documentation -- 1.8.2.3