SPECS: cherokee.spec - no daemons should be required by development package...

qboosh qboosh at pld-linux.org
Tue Oct 21 17:49:26 CEST 2008


Author: qboosh                       Date: Tue Oct 21 15:49:26 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- no daemons should be required by development packages: separated -libs

---- Files affected:
SPECS:
   cherokee.spec (1.20 -> 1.21) 

---- Diffs:

================================================================
Index: SPECS/cherokee.spec
diff -u SPECS/cherokee.spec:1.20 SPECS/cherokee.spec:1.21
--- SPECS/cherokee.spec:1.20	Tue Oct 21 08:28:51 2008
+++ SPECS/cherokee.spec	Tue Oct 21 17:49:20 2008
@@ -37,7 +37,6 @@
 BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.268
 BuildRequires:	zlib-devel
-Requires(post,postun):	/sbin/ldconfig
 Requires(post,preun):	rc-scripts
 Requires(postun):	/usr/sbin/groupdel
 Requires(postun):	/usr/sbin/userdel
@@ -45,6 +44,7 @@
 Requires(pre):	/usr/bin/getgid
 Requires(pre):	/usr/sbin/groupadd
 Requires(pre):	/usr/sbin/useradd
+Requires:	%{name}-libs = %{version}-%{release}
 Suggests:	php-fcgi
 Provides:	group(cherokee)
 Provides:	group(http)
@@ -73,11 +73,22 @@
 uwierzytelnianie, opcje związane z pamięcią podręczną, PHP, własne
 zarządzanie błędami i wiele więcej.
 
+%package libs
+Summary:	Cherokee web server libraries
+Summary(pl.UTF-8):	Biblioteki serwera WWW Cherokee
+Group:		Libraries
+
+%description libs
+Cherokee web server libraries.
+
+%description libs -l pl.UTF-8
+Biblioteki serwera WWW Cherokee.
+
 %package devel
 Summary:	Header files for Cherokee web server
 Summary(pl.UTF-8):	Pliki nagłówkowe dla serwera WWW Cherokee
 Group:		Development/Libraries
-Requires:	%{name} = %{version}-%{release}
+Requires:	%{name}-libs = %{version}-%{release}
 
 %description devel
 Header files for Cherokee web server.
@@ -137,7 +148,6 @@
 %addusertogroup cherokee http
 
 %post
-/sbin/ldconfig
 /sbin/chkconfig --add %{name}
 %service %{name} restart "Cherokee webserver"
 exit 0
@@ -149,13 +159,15 @@
 fi
 
 %postun
-/sbin/ldconfig
 if [ "$1" = "0" ]; then
 	%userremove cherokee
 	%groupremove cherokee
 	%groupremove http
 fi
 
+%post	libs -p /sbin/ldconfig
+%postun	libs -p /sbin/ldconfig
+
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog TODO html contrib/*to*.py
@@ -213,14 +225,6 @@
 %attr(755,root,root) %{_libdir}/cherokee/libplugin_scgi.so
 %attr(755,root,root) %{_libdir}/cherokee/libplugin_server_info.so
 %attr(755,root,root) %{_libdir}/cherokee/libplugin_w3c.so
-%attr(755,root,root) %{_libdir}/libcherokee-base.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libcherokee-base.so.0
-%attr(755,root,root) %{_libdir}/libcherokee-client.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libcherokee-client.so.0
-%attr(755,root,root) %{_libdir}/libcherokee-config.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libcherokee-config.so.0
-%attr(755,root,root) %{_libdir}/libcherokee-server.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libcherokee-server.so.0
 
 %{_mandir}/man1/cget.1*
 %{_mandir}/man1/cherokee.1*
@@ -247,19 +251,28 @@
 
 %dir %attr(750,cherokee,logs) /var/log/%{name}
 
+%files libs
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libcherokee-base.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libcherokee-base.so.0
+%attr(755,root,root) %{_libdir}/libcherokee-client.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libcherokee-client.so.0
+%attr(755,root,root) %{_libdir}/libcherokee-config.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libcherokee-config.so.0
+%attr(755,root,root) %{_libdir}/libcherokee-server.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libcherokee-server.so.0
+
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/cherokee-config
-
-%{_libdir}/libcherokee-base.la
 %attr(755,root,root) %{_libdir}/libcherokee-base.so
-%{_libdir}/libcherokee-client.la
 %attr(755,root,root) %{_libdir}/libcherokee-client.so
-%{_libdir}/libcherokee-config.la
 %attr(755,root,root) %{_libdir}/libcherokee-config.so
-%{_libdir}/libcherokee-server.la
 %attr(755,root,root) %{_libdir}/libcherokee-server.so
-
+%{_libdir}/libcherokee-base.la
+%{_libdir}/libcherokee-client.la
+%{_libdir}/libcherokee-config.la
+%{_libdir}/libcherokee-server.la
 %{_includedir}/cherokee
 %{_pkgconfigdir}/cherokee.pc
 %{_aclocaldir}/cherokee.m4
@@ -271,6 +284,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.21  2008/10/21 15:49:20  qboosh
+- no daemons should be required by development packages: separated -libs
+
 Revision 1.20  2008/10/21 06:28:51  qboosh
 - sorted BRs
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/cherokee.spec?r1=1.20&r2=1.21&f=u



More information about the pld-cvs-commit mailing list