packages: varnish/varnish.spec - -libs split; rel 2

[glen]

Author: glen                         Date: Mon Oct  5 12:43:54 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- -libs split; rel 2

---- Files affected:
packages/varnish:
   varnish.spec (1.38 -> 1.39) 

---- Diffs:

================================================================
Index: packages/varnish/varnish.spec
diff -u packages/varnish/varnish.spec:1.38 packages/varnish/varnish.spec:1.39
--- packages/varnish/varnish.spec:1.38	Mon Jul 20 16:04:45 2009
+++ packages/varnish/varnish.spec	Mon Oct  5 14:43:49 2009
@@ -5,7 +5,7 @@
 Summary(pl.UTF-8):	Varnish - wydajny akcelerator HTTP
 Name:		varnish
 Version:	2.0.4
-Release:	1
+Release:	2
 License:	BSD
 Group:		Networking/Daemons/HTTP
 Source0:	http://dl.sourceforge.net/varnish/%{name}-%{version}.tar.gz
@@ -25,14 +25,13 @@
 BuildRequires:	libstdc++-devel
 BuildRequires:	libtool >= 2:1.5
 BuildRequires:	ncurses-devel
-Requires(post):	/sbin/ldconfig
-Requires(postun):	/sbin/ldconfig
 Requires(postun):	/usr/sbin/groupdel
 Requires(postun):	/usr/sbin/userdel
 Requires(pre):	/bin/id
 Requires(pre):	/usr/bin/getgid
 Requires(pre):	/usr/sbin/groupadd
 Requires(pre):	/usr/sbin/useradd
+Requires:	%{name}-libs = %{version}-%{release}
 Requires:	gcc
 Requires:	glibc-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -54,11 +53,19 @@
 2.6 i będzie wykorzystywał w pełni zaawansowane możliwości we/we
 oferowane przez te systemy operacyjne.
 
+%package libs
+Summary:	Libraries for Varnish
+Group:		Libraries
+Conflicts:	varnish < 2.0.4-2
+
+%description libs
+Libraies for Varnish.
+
 %package devel
 Summary:	Header files for varnish library
 Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki varnish
 Group:		Development/Libraries
-Requires:	%{name} = %{version}-%{release}
+Requires:	%{name}-libs = %{version}-%{release}
 
 %description devel
 Header files for varnish library.
@@ -118,7 +125,6 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post
-/sbin/ldconfig
 /sbin/chkconfig --add varnish
 /sbin/chkconfig --add varnishlog
 /sbin/chkconfig --add varnishncsa
@@ -131,7 +137,6 @@
 %useradd -u 241 -d /var/lib/%{name} -g %{name} -c "Varnishd User" %{name}
 
 %postun
-/sbin/ldconfig
 if [ "$1" = "0" ]; then
 	%userremove %{name}
 	%groupremove %{name}
@@ -148,6 +153,9 @@
 	/sbin/chkconfig --del varnishncsa
 fi
 
+%post	libs -p /sbin/ldconfig
+%postun	libs -p /sbin/ldconfig
+
 %files
 %defattr(644,root,root,755)
 %doc LICENSE README ChangeLog
@@ -161,15 +169,18 @@
 %attr(754,root,root) /etc/rc.d/init.d/varnishncsa
 %attr(755,root,root) %{_sbindir}/varnishd
 %attr(755,root,root) %{_bindir}/varnish*
-%attr(755,root,root) %{_libdir}/libvarnish*.so.*.*.*
-%attr(755,root,root) %{_libdir}/libvcl.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libvarnish*.so.1
-%attr(755,root,root) %ghost %{_libdir}/libvcl.so.1
 %{_mandir}/man1/*
 %{_mandir}/man7/*
 /var/lib/varnish
 /var/run/varnish
 
+%files libs
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libvarnish*.so.*.*.*
+%attr(755,root,root) %{_libdir}/libvcl.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libvarnish*.so.1
+%attr(755,root,root) %ghost %{_libdir}/libvcl.so.1
+
 %files devel
 %defattr(644,root,root,755)
 %{_includedir}/varnish
@@ -187,6 +198,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.39  2009/10/05 12:43:49  glen
+- -libs split; rel 2
+
 Revision 1.38  2009/07/20 14:04:45  glen
 - release 1
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/varnish/varnish.spec?r1=1.38&r2=1.39&f=u