SPECS (DEVEL): php4.spec - pass2: manual conversions

[glen]

Author: glen                         Date: Thu Jul 14 15:50:46 2005 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- pass2: manual conversions

---- Files affected:
SPECS:
   php4.spec (1.453.2.2 -> 1.453.2.3) 

---- Diffs:

================================================================
Index: SPECS/php4.spec
diff -u SPECS/php4.spec:1.453.2.2 SPECS/php4.spec:1.453.2.3
--- SPECS/php4.spec:1.453.2.2	Thu Jul 14 17:48:02 2005
+++ SPECS/php4.spec	Thu Jul 14 17:50:41 2005
@@ -2174,14 +2174,12 @@
 	%{_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
+%triggerpostun ncurses -- %{name}-ncurses < 3:4.4.0-2.1
+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
 
 %post oci8
@@ -2222,14 +2220,12 @@
 	%{_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
+%triggerpostun pcntl -- %{name}-pcntl < 3:4.4.0-2.1
+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
 
 %post pcre
@@ -2276,14 +2272,12 @@
 	%{_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
+%triggerpostun readline -- %{name}-readline < 3:4.4.0-2.1
+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
 
 %post recode
@@ -2881,6 +2875,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.453.2.3  2005/07/14 15:50:41  glen
+- pass2: manual conversions
+
 Revision 1.453.2.2  2005/07/14 15:48:02  glen
 - pass1: convert %preun to %triggers:
 :%s#^%preun \(.*\)\nif.*\n\t\(.*\)\nfi#%triggerpostun \1 -- %{name}-\1 < 3:4.4.0-2.1\r\2#g
================================================================

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