[gridsite/el6] Correct package interdependencies.

[stevetraylen]

commit ba5cd2bfe84059561dfdbcd7bdb9df0a6b1a50d3
Author: Steve Traylen <steve.traylen at cern.ch>
Date:   Mon Sep 23 07:12:19 2013 +0000

    Correct package interdependencies.

 gridsite.spec |   21 ++++++++++++---------
 1 files changed, 12 insertions(+), 9 deletions(-)
---
diff --git a/gridsite.spec b/gridsite.spec
index 09e6dc2..57c6aa3 100644
--- a/gridsite.spec
+++ b/gridsite.spec
@@ -5,11 +5,11 @@
 # The compat* variables refer to the compat packages.
 
 %global         normalver 2.0.4
-%global         normalrel 1
+%global         normalrel 2
 %global         normalso 2
 
 %global         compatver 1.7.25
-%global         compatrel 1
+%global         compatrel 2
 %global         compatso 1.7
 
 Name:           gridsite
@@ -68,11 +68,11 @@ BuildRequires:  canl-c-devel
 
 Requires:       httpd-mmn = %{_httpd_mmn}
 Requires:       mod_ssl
-Requires:       gridsite-libs = %{version}-%{release}
+Requires:       gridsite-libs = %{normalver}-%{normalrel}%{?dist}
 
-Provides:       gridsite-apache = %{version}-%{release}
+Provides:       gridsite-apache = %{normalver}-%{normalrel}%{?dist}
 Obsoletes:      gridsite-apache <= 1.7.20
-Provides:       gridsite-services = %{version}-%{release}
+Provides:       gridsite-services = %{normalver}-%{normalrel}%{?dist}
 Obsoletes:      gridsite-services <= 1.7.20
 
 %description
@@ -116,8 +116,8 @@ This package contains the runtime libraries.
 %package  clients
 Group:    System Environment/Daemons
 Summary:  Clients to gridsite including htcp, htrm, htmv
-Requires: gridsite-libs = %{version}-%{release}
-Provides: gridsite-commands = %{version}-%{release}
+Requires: gridsite-libs = %{normalver}-%{normalrel}%{?dist}
+Provides: gridsite-commands = %{normalver}-%{normalrel}%{?dist}
 Obsoletes:gridsite-commands <= 1.7.20
 
 %description  clients
@@ -132,7 +132,7 @@ htcp, htrm, ...
 %package  devel
 Group:    System Environment/Daemons
 Summary:  Developers tools for gridsite
-Requires: gridsite-libs = %{version}-%{release}
+Requires: gridsite-libs = %{normalver}-%{normalrel}%{?dist}
 Requires: openssl-devel
 
 %description  devel
@@ -357,8 +357,11 @@ rm -rf $RPM_BUILD_ROOT
 %doc src/doxygen LICENSE
 
 %changelog
+* Mon Sep 23 2013 Steve Traylen <steve.traylen at cern.ch> - 2.0.4-2
+- Correct package interdependencies.
+
 * Thu Sep 19 2013 Steve Traylen <steve.traylen at cern.ch> - 2.0.4-1
- - Upstream to 2.0.4, gridsite1.7-compat added.
+- Upstream to 2.0.4, gridsite1.7-compat added.
 
 * Tue Jun 04 2013 Adrien Devresse <adevress at cern.ch> - 1.7.25-2
  - Upstream to 1.7.25