- -libs subpackage (req by arekm)

- restart service on upgrade and stop silently on uninstall

Changed files:
    distcache.spec -> 1.6

diff --git a/distcache.spec b/distcache.spec
index 179c9402be4c9b7583b93a7530cd81c388480385..a729e5da30e0a514cd6262c102ed14b6db5b4592 100644 (file)
--- a/distcache.spec
+++ b/distcache.spec
@@ -2,22 +2,23 @@ Summary:      Distributed SSL session cache
 Summary(pl):   Rozproszona pamiêæ podrêczna sesji SSL
 Name:          distcache
 Version:       1.4.5
-Release:       0.1
+Release:       0.4
 License:       LGPL
 Group:         Daemons
 Source0:       http://dl.sourceforge.net/distcache/%{name}-%{version}.tar.bz2
 # Source0-md5: bad485801024f711ad72e83ba1adcd7d
 Source1:       dc_server.init
 Source2:       dc_client.init
-Source3:       distcache.sysconfig
+Source3:       %{name}.sysconfig
 Patch0:                %{name}-setuid.patch
 URL:           http://www.distcache.org/
+BuildRequires: rpmbuild(macros) >= 1.228
 BuildRequires: autoconf >= 2.50
 BuildRequires: automake >= 1:1.7
 BuildRequires: libtool
 BuildRequires: openssl-devel
-Requires(post):        /sbin/ldconfig
 Requires(post,preun):  /sbin/chkconfig
+Requires:      %{name}-libs = %{version}-%{release}
 Requires:      rc-scripts
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -31,6 +32,17 @@ Pakiet distcache udost
 dzia³anie sieciowego systemu pamiêci podrêcznej sesji, g³ównie (choæ
 niekoniecznie tylko) w celu zapamiêtywania sesji SSL/TLS.
 
+%package libs
+Summary:       Shared distcache distributed session cache libraries
+Group:         Libraries
+
+%description libs
+This package includes the shared libraries that implement the
+necessary network functionality, the session caching protocol, and
+APIs for applications wishing to use a distributed session cache, or
+indeed even to implement a storage mechanism for a session cache
+server.
+
 %package devel
 Summary:       Header files for distcache distributed session cache library
 Summary(pl):   Pliki nag³ówkowe biblioteki rozproszonej pamiêci podrêcznej sesji distcache
@@ -96,33 +108,38 @@ rm -f $RPM_BUILD_ROOT%{_bindir}/{nal_test,piper}
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post  libs -p /sbin/ldconfig
+%postun        libs -p /sbin/ldconfig
+
 %post
-/sbin/ldconfig
 /sbin/chkconfig --add dc_server
 /sbin/chkconfig --add dc_client
+%service dc_server restart "Distcache SSL Session Cache Server"
+%service dc_client restart "Distcache SSL Session Cache Client Proxy"
 
 %preun
 if [ "$1" = "0" ]; then
-       /etc/rc.d/init.d/dc_server stop
        /sbin/chkconfig --del dc_server
-       /etc/rc.d/init.d/dc_client stop
        /sbin/chkconfig --del dc_client
+       %service -q dc_server stop
+       %service -q dc_client stop
 fi
 
-%postun -p /sbin/ldconfig
-
 %files
 %defattr(644,root,root,755)
 %doc ANNOUNCE CHANGES README LICENSE FAQ
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/*
 %attr(755,root,root) %{_bindir}/sslswamp
 %attr(755,root,root) %{_bindir}/dc_*
-%attr(755,root,root) %{_libdir}/*.so.*
 %attr(754,root,root) /etc/rc.d/init.d/dc_*
 %{_datadir}/swamp
 %{_mandir}/man1/*
 %{_mandir}/man8/*
 
+%files libs
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/*.so.*
+
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/*.so