- GridSite pkgs by EMI obsolete their EPEL counterparts

- gridsite-devel requires gridsite-shared

diff --git a/org.gridsite.core/CHANGES b/org.gridsite.core/CHANGES
index 2face7b..0dddca3 100644 (file)
--- a/org.gridsite.core/CHANGES
+++ b/org.gridsite.core/CHANGES
@@ -1,3 +1,6 @@
+* Tue Feb 22 2011 Zdenek Sustr <sustr4@cesnet.cz>
+ - Extended formulation of dependencies btw. packages
+   to fix conflicts when upgrading from EPEL.
 * Tue Nov 23 2010 Andrew McNab <Andrew.McNab@cern.ch>
 - ==== GridSite version 1.7.10 ====
 * Mon Nov 22 2010 Andrew McNab <Andrew.McNab@cern.ch>

diff --git a/org.gridsite.core/src/make-gridsite-spec b/org.gridsite.core/src/make-gridsite-spec
index 0b41da8..cc7de9a 100755 (executable)
--- a/org.gridsite.core/src/make-gridsite-spec
+++ b/org.gridsite.core/src/make-gridsite-spec
@@ -54,6 +54,7 @@ See http://www.gridsite.org/ for details.
 Group: Development/Libraries
 Summary: GridSite shared library and core documentation
 Provides: gridsite
+Obsoletes: gridsite-libs
 
 %description shared
 GridSite shared library and core documentation
@@ -63,6 +64,7 @@ See http://www.gridsite.org/ for details.
 %package devel
 Group: Development/Libraries
 Summary: GridSite .a libraries and .h headers
+Requires: gridsite-shared
 
 %description devel
 GridSite development libraries
@@ -73,6 +75,7 @@ See http://www.gridsite.org/ for details.
 Group: System Environment/Daemons
 Summary: GridSite mod_gridsite module for Apache httpd
 Requires: gridsite-shared
+Obsoletes: gridsite
 
 %description apache
 GridSite Apache module and CGI binaries