SPECS (DEVEL): php4.spec - handle commandline modules the old way

[glen]

Author: glen                         Date: Thu Jul 14 16:28:47 2005 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- handle commandline modules the old way

---- Files affected:
SPECS:
   php4.spec (1.453.2.5 -> 1.453.2.6) 

---- Diffs:

================================================================
Index: SPECS/php4.spec
diff -u SPECS/php4.spec:1.453.2.5 SPECS/php4.spec:1.453.2.6
--- SPECS/php4.spec:1.453.2.5	Thu Jul 14 18:23:34 2005
+++ SPECS/php4.spec	Thu Jul 14 18:28:42 2005
@@ -2204,20 +2204,22 @@
 [ ! -x %{_sbindir}/php4-module-install ] || %{_sbindir}/php4-module-install remove mysql %{_sysconfdir}/php.ini
 
 %post ncurses
-# FIXME: not in global php.ini!
-#if [ -f %{_sysconfdir}/php-cgi.ini ]; then
-#	%{_sbindir}/php4-module-install install ncurses %{_sysconfdir}/php-cgi.ini
-#fi
-#if [ -f %{_sysconfdir}/php-cli.ini ]; then
-#	%{_sbindir}/php4-module-install install ncurses %{_sysconfdir}/php-cli.ini
-#fi
-
-%triggerpostun ncurses -- %{name}-ncurses < 3:4.4.0-2.1
+# NOTE: only for cli/cgi
 if [ -f %{_sysconfdir}/php-cgi.ini ]; then
-	[ ! -x %{_sbindir}/php4-module-install ] || %{_sbindir}/php4-module-install remove ncurses %{_sysconfdir}/php-cgi.ini
+	%{_sbindir}/php4-module-install install ncurses %{_sysconfdir}/php-cgi.ini
 fi
 if [ -f %{_sysconfdir}/php-cli.ini ]; then
-	[ ! -x %{_sbindir}/php4-module-install ] || %{_sbindir}/php4-module-install remove ncurses %{_sysconfdir}/php-cli.ini
+	%{_sbindir}/php4-module-install install ncurses %{_sysconfdir}/php-cli.ini
+fi
+
+%preun ncurses 
+if [ "$1" = "0" ]; then
+	if [ -f %{_sysconfdir}/php-cgi.ini ]; then
+		[ ! -x %{_sbindir}/php4-module-install ] || %{_sbindir}/php4-module-install remove ncurses %{_sysconfdir}/php-cgi.ini
+	fi
+	if [ -f %{_sysconfdir}/php-cli.ini ]; then
+		[ ! -x %{_sbindir}/php4-module-install ] || %{_sbindir}/php4-module-install remove ncurses %{_sysconfdir}/php-cli.ini
+	fi
 fi
 
 %post oci8
@@ -2256,20 +2258,22 @@
 [ ! -x %{_sbindir}/php4-module-install ] || %{_sbindir}/php4-module-install remove overload %{_sysconfdir}/php.ini
 
 %post pcntl
-# FIXME: not in global php.ini!
-#if [ -f %{_sysconfdir}/php-cgi.ini ]; then
-#	%{_sbindir}/php4-module-install install pcntl %{_sysconfdir}/php-cgi.ini
-#fi
-#if [ -f %{_sysconfdir}/php-cli.ini ]; then
-#	%{_sbindir}/php4-module-install install pcntl %{_sysconfdir}/php-cli.ini
-#fi
-
-%triggerpostun pcntl -- %{name}-pcntl < 3:4.4.0-2.1
+# NOTE: only for cli/cgi
 if [ -f %{_sysconfdir}/php-cgi.ini ]; then
-	[ ! -x %{_sbindir}/php4-module-install ] || %{_sbindir}/php4-module-install remove pcntl %{_sysconfdir}/php-cgi.ini
+	%{_sbindir}/php4-module-install install pcntl %{_sysconfdir}/php-cgi.ini
 fi
 if [ -f %{_sysconfdir}/php-cli.ini ]; then
-	[ ! -x %{_sbindir}/php4-module-install ] || %{_sbindir}/php4-module-install remove pcntl %{_sysconfdir}/php-cli.ini
+	%{_sbindir}/php4-module-install install pcntl %{_sysconfdir}/php-cli.ini
+fi
+
+%preun pcntl 
+if [ "$1" = "0" ]; then
+	if [ -f %{_sysconfdir}/php-cgi.ini ]; then
+		[ ! -x %{_sbindir}/php4-module-install ] || %{_sbindir}/php4-module-install remove pcntl %{_sysconfdir}/php-cgi.ini
+	fi
+	if [ -f %{_sysconfdir}/php-cli.ini ]; then
+		[ ! -x %{_sbindir}/php4-module-install ] || %{_sbindir}/php4-module-install remove pcntl %{_sysconfdir}/php-cli.ini
+	fi
 fi
 
 %post pcre
@@ -2315,20 +2319,22 @@
 [ ! -x %{_sbindir}/php4-module-install ] || %{_sbindir}/php4-module-install remove qtdom %{_sysconfdir}/php.ini
 
 %post readline
-# FIXME: not in global php.ini!
-#if [ -f %{_sysconfdir}/php-cgi.ini ]; then
-#	%{_sbindir}/php4-module-install install readline %{_sysconfdir}/php-cgi.ini
-#fi
-#if [ -f %{_sysconfdir}/php-cli.ini ]; then
-#	%{_sbindir}/php4-module-install install readline %{_sysconfdir}/php-cli.ini
-#fi
-
-%triggerpostun readline -- %{name}-readline < 3:4.4.0-2.1
+# NOTE: only for cli/cgi
 if [ -f %{_sysconfdir}/php-cgi.ini ]; then
-	[ ! -x %{_sbindir}/php4-module-install ] || %{_sbindir}/php4-module-install remove readline %{_sysconfdir}/php-cgi.ini
+	%{_sbindir}/php4-module-install install readline %{_sysconfdir}/php-cgi.ini
 fi
 if [ -f %{_sysconfdir}/php-cli.ini ]; then
-	[ ! -x %{_sbindir}/php4-module-install ] || %{_sbindir}/php4-module-install remove readline %{_sysconfdir}/php-cli.ini
+	%{_sbindir}/php4-module-install install readline %{_sysconfdir}/php-cli.ini
+fi
+
+%preun readline
+if [ "$1" = "0" ]; then
+	if [ -f %{_sysconfdir}/php-cgi.ini ]; then
+		[ ! -x %{_sbindir}/php4-module-install ] || %{_sbindir}/php4-module-install remove readline %{_sysconfdir}/php-cgi.ini
+	fi
+	if [ -f %{_sysconfdir}/php-cli.ini ]; then
+		[ ! -x %{_sbindir}/php4-module-install ] || %{_sbindir}/php4-module-install remove readline %{_sysconfdir}/php-cli.ini
+	fi
 fi
 
 %post recode
@@ -2745,7 +2751,6 @@
 
 %files ncurses
 %defattr(644,root,root,755)
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/php.d/ncurses.ini
 %attr(755,root,root) %{extensionsdir}/ncurses.so
 
 %if %{with oci8}
@@ -2783,7 +2788,6 @@
 
 %files pcntl
 %defattr(644,root,root,755)
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/php.d/pcntl.ini
 %attr(755,root,root) %{extensionsdir}/pcntl.so
 
 %if %{with pcre}
@@ -2828,7 +2832,6 @@
 
 %files readline
 %defattr(644,root,root,755)
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/php.d/readline.ini
 %attr(755,root,root) %{extensionsdir}/readline.so
 
 %if %{with recode}
@@ -2869,7 +2872,6 @@
 
 %files sybase-ct
 %defattr(644,root,root,755)
-# NOTE: module name and inifile names differ.
 %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/php.d/sybase_ct.ini
 %attr(755,root,root) %{extensionsdir}/sybase_ct.so
 %endif
@@ -2945,6 +2947,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.453.2.6  2005/07/14 16:28:42  glen
+- handle commandline modules the old way
+
 Revision 1.453.2.5  2005/07/14 16:23:34  glen
 - fix sybase-ct inifile
 - pcntl/readline not for apache. hmm
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/php4.spec?r1=1.453.2.5&r2=1.453.2.6&f=u