SPECS: php4-eaccelerator.spec, php4-mcache.spec, php4-mmcache.spec...

glen glen at pld-linux.org
Mon Sep 12 00:39:25 CEST 2005 

Author: glen                         Date: Sun Sep 11 22:39:25 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- full conf.d support and unifications

---- Files affected:
SPECS:
   php4-eaccelerator.spec (1.14 -> 1.15) , php4-mcache.spec (1.11 -> 1.12) , php4-mmcache.spec (1.31 -> 1.32) , php4-rrdtool.spec (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: SPECS/php4-eaccelerator.spec
diff -u SPECS/php4-eaccelerator.spec:1.14 SPECS/php4-eaccelerator.spec:1.15
--- SPECS/php4-eaccelerator.spec:1.14	Sun Sep 11 23:05:32 2005
+++ SPECS/php4-eaccelerator.spec	Mon Sep 12 00:39:20 2005
@@ -19,8 +19,8 @@
 URL:		http://eaccelerator.sourceforge.net/
 BuildRequires:	php4-devel >= 3:4.1
 %requires_eq_to php4 php4-devel
-Requires:	php4-zlib
 Requires:	%{_sysconfdir}/conf.d
+Requires:	php4-zlib
 Conflicts:	php-mmcache
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -117,6 +117,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.15  2005/09/11 22:39:20  glen
+- full conf.d support and unifications
+
 Revision 1.14  2005/09/11 21:05:32  glen
 - only encoder.php in base package (but why?)
 

================================================================
Index: SPECS/php4-mcache.spec
diff -u SPECS/php4-mcache.spec:1.11 SPECS/php4-mcache.spec:1.12
--- SPECS/php4-mcache.spec:1.11	Wed Sep  7 16:11:33 2005
+++ SPECS/php4-mcache.spec	Mon Sep 12 00:39:20 2005
@@ -1,6 +1,7 @@
 # $Revision$, $Date$
 %define		_name		mcache
 %define		_sysconfdir	/etc/php4
+%define		extensionsdir	%(php-config --extension-dir 2>/dev/null)
 
 Summary:	mcache PHP Extension
 Summary(pl):	Rozszerzenie PHP mcache
@@ -15,15 +16,13 @@
 # Source0-md5:	bbe636154f8dc8ab3889054cf4ace2bd
 URL:		http://www.klir.com/~johnm/php-mcache/
 BuildRequires:	libmemcache-devel >= 1.3.0
-BuildRequires:	rpmbuild(macros) >= 1.230
 BuildRequires:	php4-devel
+BuildRequires:	rpmbuild(macros) >= 1.230
 %requires_eq_to php4-common php4-devel
 Requires:	%{_sysconfdir}/conf.d
 Requires(post,preun):	php-common >= 3:4.1
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		extensionsdir	%(php-config --extension-dir 2>/dev/null)
-
 %description
 mcache is a PHP extension that aims to enable developers to easily and
 efficiently cache data to Memcached servers.
@@ -107,6 +106,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.12  2005/09/11 22:39:20  glen
+- full conf.d support and unifications
+
 Revision 1.11  2005/09/07 14:11:33  glen
 - phpize already calls aclocal
 

================================================================
Index: SPECS/php4-mmcache.spec
diff -u SPECS/php4-mmcache.spec:1.31 SPECS/php4-mmcache.spec:1.32
--- SPECS/php4-mmcache.spec:1.31	Wed Sep  7 16:12:25 2005
+++ SPECS/php4-mmcache.spec	Mon Sep 12 00:39:20 2005
@@ -1,13 +1,14 @@
 # $Revision$, $Date$
-%define		_name		mmcache
+%define		_modname		mmcache
 %define		_pkgname	turck-mmcache
-%define		php_ver		%(rpm -q --qf '%%{epoch}:%%{version}' php4-devel)
+%define		_sysconfdir	/etc/php4
+%define		extensionsdir	%(php-config --extension-dir 2>/dev/null)
 
 Summary:	Turck MMCache extension module for PHP
 Summary(pl):	Moduł Turck MMCache dla PHP
-Name:		php4-%{_name}
+Name:		php4-%{_modname}
 Version:	2.4.6
-Release:	5
+Release:	5.2
 Epoch:		0
 License:	GPL
 Group:		Libraries
@@ -16,17 +17,15 @@
 # Source0-md5:	bcf671bec2e8b009e9b2d8f8d2574041
 Patch0:		%{name}-debian-8.patch
 URL:		http://turck-mmcache.sourceforge.net
-BuildRequires:	php4-devel >= 4.1
 BuildRequires:	libtool
+BuildRequires:	php4-devel >= 4.1
+BuildRequires:	rpmbuild(macros) >= 1.230
+%requires_eq_to php4-common php4-devel
+Requires:	%{_sysconfdir}/conf.d
 Requires:	apache >= 1.3
-Requires:	php4 = %{php_ver}
 Requires:	php4-zlib
-Requires(post,preun):	php4-common >= 4.1
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_sysconfdir	/etc/php4
-%define		extensionsdir	%{_libdir}/php4
-
 %description
 Turck MMCache is a PHP Accelerator & Encoder. It increases performance
 of PHP scripts by caching them in compiled state, so that the overhead
@@ -49,9 +48,7 @@
 Summary(pl):	Osobny loader plików Turck MMCache
 Group:		Libraries
 Requires:	apache >= 1.3
-Requires(post,preun):	php4-common >= 4.1
-Requires:	php4 >= %{php_ver}
-Requires:	php4 <= %{php_ver}-999
+%requires_eq_to php4-common php4-devel
 Provides:	TurckLoader = %{epoch}:%{version}-%{release}
 
 %description TurckLoader
@@ -105,42 +102,56 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{extensionsdir}
-install -d $RPM_BUILD_ROOT%{_bindir}
+install -d $RPM_BUILD_ROOT{%{_sysconfdir}/conf.d,%{extensionsdir},%{_bindir}}
 
 install ./modules/mmcache.so $RPM_BUILD_ROOT%{extensionsdir}
 install ./encoder.php $RPM_BUILD_ROOT%{_bindir}
-
 install ./TurckLoader/modules/TurckLoader.so $RPM_BUILD_ROOT%{extensionsdir}
 
+cat <<'EOF' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/%{_modname}.ini
+; Enable %{_modname} extension module
+extension=%{_modname}.so
+EOF
+
+cat <<'EOF' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/TurckLoader.ini
+; Enable TurkLoader
+extension=TurkLoader.so
+EOF
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-%{_sbindir}/php4-module-install install mmcache %{_sysconfdir}/php.ini
+[ ! -f /etc/apache/conf.d/??_mod_php4.conf ] || %service -q apache restart
+[ ! -f /etc/httpd/httpd.conf/??_mod_php4.conf ] || %service -q httpd restart
 
-%preun
-if [ "$1" = "0" ]; then
-	%{_sbindir}/php4-module-install remove mmcache %{_sysconfdir}/php.ini
+%postun
+if [ "$1" = 0 ]; then
+	[ ! -f /etc/apache/conf.d/??_mod_php4.conf ] || %service -q apache restart
+	[ ! -f /etc/httpd/httpd.conf/??_mod_php4.conf ] || %service -q httpd restart
 fi
 
 %post TurckLoader
-%{_sbindir}/php4-module-install install TurckLoader %{_sysconfdir}/php.ini
+[ ! -f /etc/apache/conf.d/??_mod_php4.conf ] || %service -q apache restart
+[ ! -f /etc/httpd/httpd.conf/??_mod_php4.conf ] || %service -q httpd restart
 
-%preun TurckLoader
-if [ "$1" = "0" ]; then
-	%{_sbindir}/php4-module-install remove TurckLoader %{_sysconfdir}/php.ini
+%postun TurckLoader
+if [ "$1" = 0 ]; then
+	[ ! -f /etc/apache/conf.d/??_mod_php4.conf ] || %service -q apache restart
+	[ ! -f /etc/httpd/httpd.conf/??_mod_php4.conf ] || %service -q httpd restart
 fi
 
 %files
 %defattr(644,root,root,755)
 %doc CREDITS EXPERIMENTAL README TODO
+%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/%{_modname}.ini
 %attr(755,root,root) %{extensionsdir}/mmcache.so
 %attr(755,root,root) %{_bindir}/encoder.php
 
 %files TurckLoader
 %defattr(644,root,root,755)
 %doc CREDITS EXPERIMENTAL
+%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/TurckLoader.ini
 %attr(755,root,root) %{extensionsdir}/TurckLoader.so
 
 %files webinterface
@@ -154,6 +165,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.32  2005/09/11 22:39:20  glen
+- full conf.d support and unifications
+
 Revision 1.31  2005/09/07 14:12:25  glen
 - phpize already calls aclocal
 

================================================================
Index: SPECS/php4-rrdtool.spec
diff -u SPECS/php4-rrdtool.spec:1.5 SPECS/php4-rrdtool.spec:1.6
--- SPECS/php4-rrdtool.spec:1.5	Wed Sep  7 16:19:16 2005
+++ SPECS/php4-rrdtool.spec	Mon Sep 12 00:39:20 2005
@@ -19,9 +19,8 @@
 BuildRequires:	php4-devel
 BuildRequires:	rpmbuild(macros) >= 1.230
 BuildRequires:	rrdtool-devel
-Requires(post,preun):	php4-common
-Requires:	%{_sysconfdir}/conf.d
 %requires_eq_to php4-common php4-devel
+Requires:	%{_sysconfdir}/conf.d
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -85,6 +84,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.6  2005/09/11 22:39:20  glen
+- full conf.d support and unifications
+
 Revision 1.5  2005/09/07 14:19:16  glen
 - rel 2, STBR
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/php4-eaccelerator.spec?r1=1.14&r2=1.15&f=u
    http://cvs.pld-linux.org/SPECS/php4-mcache.spec?r1=1.11&r2=1.12&f=u
    http://cvs.pld-linux.org/SPECS/php4-mmcache.spec?r1=1.31&r2=1.32&f=u
    http://cvs.pld-linux.org/SPECS/php4-rrdtool.spec?r1=1.5&r2=1.6&f=u

More information about the pld-cvs-commit mailing list