rpms/myproxy/F-13 myproxy.spec,1.10,1.11

[stevetraylen]

Author: stevetraylen

Update of /cvs/pkgs/rpms/myproxy/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv17088

Modified Files:
	myproxy.spec 
Log Message:
rhbz#585189



Index: myproxy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/myproxy/F-13/myproxy.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- myproxy.spec	9 Mar 2010 19:25:39 -0000	1.10
+++ myproxy.spec	15 May 2010 18:58:13 -0000	1.11
@@ -8,7 +8,7 @@
 
 Name:           myproxy
 Version:        5.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Manage X.509 Public Key Infrastructure (PKI) security credentials
 
 Group:          System Environment/Daemons
@@ -47,6 +47,12 @@ BuildRequires:  tetex-latex
 %endif
 %endif
 
+Requires:      myproxy-libs = %{version}-%{release}
+Requires:      globus-proxy-utils
+Requires:      voms-clients
+
+Obsoletes:     myproxy-client < 5.1-2
+Provides:      myproxy-client = %{version}-%{release}
 
 %description
 MyProxy is open source software for managing X.509 Public Key Infrastructure 
@@ -56,14 +62,12 @@ authority to allow users to securely obt
 Users run myproxy-logon to authenticate and obtain credentials, including 
 trusted CA certificates and Certificate Revocation Lists (CRLs). 
 
-%package client
-Requires:      myproxy = %{version}-%{release}
-Requires:      globus-proxy-utils
-Requires:      voms-clients
+%package libs
 Summary:       Manage X.509 Public Key Infrastructure (PKI) security credentials 
 Group:         System Environment/Daemons
+Obsoletes:     myproxy < 5.1-2
 
-%description client
+%description libs
 MyProxy is open source software for managing X.509 Public Key Infrastructure 
 (PKI) security credentials (certificates and private keys). MyProxy 
 combines an online credential repository with an online certificate 
@@ -71,10 +75,10 @@ authority to allow users to securely obt
 Users run myproxy-logon to authenticate and obtain credentials, including 
 trusted CA certificates and Certificate Revocation Lists (CRLs). 
 
-Package %{name}-client contains client utilities for MyProxy.
+Package %{name}-libs contains runtime libs for MyProxy.
 
 %package devel
-Requires:      myproxy = %{version}-%{release}
+Requires:      myproxy-libs = %{version}-%{release}
 # in .el5 and 4 this dependency is not picked up
 # automatically via pkgconfig
 %if  0%{?el4}%{?el5}
@@ -99,7 +103,7 @@ Requires(post):   chkconfig
 Requires(preun):  chkconfig
 Requires(preun):  initscripts
 Requires(postun): initscripts
-Requires:         myproxy = %{version}-%{release}
+Requires:         myproxy-libs = %{version}-%{release}
 Summary:          Server for X.509 Public Key Infrastructure (PKI) security credentials 
 Group:            System Environment/Daemons
 
@@ -118,6 +122,7 @@ Package %{name}-server contains the MyPr
 # a load of perl dependencies.
 %package       admin
 Requires:      myproxy-server = %{version}-%{release}
+Requires:      myproxy-libs   = %{version}-%{release}
 Requires:      globus-gsi-cert-utils-progs
 Summary:       Server for X.509 Public Key Infrastructure (PKI) security credentials 
 Group:         System Environment/Daemons
@@ -281,8 +286,8 @@ done
 
 
 
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%post libs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
 
 %pre server
 getent group myproxy >/dev/null || groupadd -r myproxy
@@ -305,17 +310,8 @@ if [ "$1" -ge "1" ] ; then
     /sbin/service myproxy-server condrestart >/dev/null 2>&1 || :
 fi
 
-
 %files
 %defattr(-,root,root,-)
-%{_datadir}/globus/packages/%{name}
-
-%doc %{_defaultdocdir}/%{name}-%{version}
-
-%{_libdir}/libmyproxy.so.*
-
-%files client
-%defattr(-,root,root,-)
 %{_bindir}/myproxy-change-pass-phrase
 %{_bindir}/myproxy-destroy
 %{_bindir}/myproxy-get-delegation
@@ -334,6 +330,12 @@ fi
 %{_mandir}/man1/myproxy-logon.1.gz
 %{_mandir}/man1/myproxy-retrieve.1.gz
 %{_mandir}/man1/myproxy-store.1.gz
+%doc %{_defaultdocdir}/%{name}-%{version}
+
+%files libs
+%defattr(-,root,root,-)
+%{_datadir}/globus/packages/%{name}
+%{_libdir}/libmyproxy.so.*
 
 %files server
 %defattr(-,root,root,-)
@@ -392,6 +394,11 @@ fi
 %{_libdir}/pkgconfig/myproxy.pc
 
 %changelog
+* Sat May 15 2010 Steve Traylen <steve.traylen at cern.ch> - 5.1-2
+- rhbz#585189 rearrange packaging.
+  clients moved from now obsoleted -client package 
+  to main package.
+  libs moved from main package to new libs package.
 * Tue Mar 9 2010 Steve Traylen <steve.traylen at cern.ch> - 5.1-1
 - New upstream 5.1
 - Remove globus-globus-usage-location.patch, now incoperated