SPECS: php4.spec - let -fcgi provide php virtual - adapterized, cl...

glen glen at pld-linux.org
Fri Dec 2 15:46:40 CET 2005


Author: glen                         Date: Fri Dec  2 14:46:40 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- let -fcgi provide php virtual
- adapterized, cleanups
- rel 6

---- Files affected:
SPECS:
   php4.spec (1.503 -> 1.504) 

---- Diffs:

================================================================
Index: SPECS/php4.spec
diff -u SPECS/php4.spec:1.503 SPECS/php4.spec:1.504
--- SPECS/php4.spec:1.503	Thu Nov 10 22:35:23 2005
+++ SPECS/php4.spec	Fri Dec  2 15:46:35 2005
@@ -78,7 +78,8 @@
 Summary(uk):	PHP ÷ĹŇÓŚ§ 4 - ÍĎ×Á ĐŇĹĐŇĎĂĹÓŐ×ÁÎÎŃ HTML-ĆÁĘĚŚ×, ×ÉËĎÎŐ×ÁÎÁ ÎÁ ÓĹŇ×ĹŇŚ
 Name:		php4
 Version:	4.4.1
-Release:	5%{?with_hardening:hardened}
+%define	_rel 6
+Release:	%{_rel}%{?with_hardening:hardened}
 Epoch:		3
 Group:		Libraries
 License:	PHP
@@ -298,10 +299,9 @@
 Summary:	php4 DSO module for apache 1.3.x
 Summary(pl):	Moduł DSO (Dynamic Shared Object) php4 dla apache 1.3.x
 Group:		Development/Languages/PHP
-PreReq:		%{name}-common = %{epoch}:%{version}-%{release}
+Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 Requires:	apache1(EAPI) >= 1.3.33-2
 Requires:	apache1-mod_mime
-Provides:	%{name} = %{epoch}:%{version}-%{release}
 Provides:	php = %{epoch}:%{version}-%{release}
 Provides:	php4 = %{epoch}:%{version}-%{release}
 Obsoletes:	phpfi
@@ -319,10 +319,9 @@
 Summary:	php4 DSO module for apache 2.x
 Summary(pl):	Moduł DSO (Dynamic Shared Object) php4 dla apache 2.x
 Group:		Development/Languages/PHP
-PreReq:		%{name}-common = %{epoch}:%{version}-%{release}
+Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 Requires:	apache >= 2.0.52-2
 Requires:	apache(modules-api) = %{apache_modules_api}
-Provides:	%{name} = %{epoch}:%{version}-%{release}
 Provides:	php = %{epoch}:%{version}-%{release}
 Provides:	php4 = %{epoch}:%{version}-%{release}
 Obsoletes:	phpfi
@@ -340,8 +339,10 @@
 Summary:	php4 as FastCGI program
 Summary(pl):	php4 jako program FastCGI
 Group:		Development/Languages/PHP
-PreReq:		%{name}-common = %{epoch}:%{version}-%{release}
+Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 Provides:	php-fcgi = %{epoch}:%{version}-%{release}
+Provides:	php = %{epoch}:%{version}-%{release}
+Provides:	php4 = %{epoch}:%{version}-%{release}
 
 %description fcgi
 php4 as FastCGI program.
@@ -353,7 +354,7 @@
 Summary:	php4 as CGI program
 Summary(pl):	php4 jako program CGI
 Group:		Development/Languages/PHP
-PreReq:		%{name}-common = %{epoch}:%{version}-%{release}
+Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 Provides:	php-cgi = %{epoch}:%{version}-%{release}
 
 %description cgi
@@ -366,7 +367,7 @@
 Summary:	php4 as CLI interpreter
 Summary(pl):	php4 jako interpreter działający z linii poleceń
 Group:		Development/Languages/PHP
-PreReq:		%{name}-common = %{epoch}:%{version}-%{release}
+Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 Provides:	php-cli = %{epoch}:%{version}-%{release}
 
 %description cli
@@ -1409,8 +1410,9 @@
 
 %description sybase
 This is a dynamic shared object (DSO) for PHP that will add Sybase and
-MS SQL databases support through SYBDB library. Currently Sybase module
-is not maintained. Using Sybase-CT module is recommended instead.
+MS SQL databases support through SYBDB library. Currently Sybase
+module is not maintained. Using Sybase-CT module is recommended
+instead.
 
 %description sybase -l pl
 Moduł PHP dodający obsługę baz danych Sybase oraz MS SQL poprzez
@@ -1498,7 +1500,7 @@
 Summary:	wddx extension module for PHP
 Summary(pl):	Moduł wddx dla PHP
 Group:		Libraries
-PreReq:		%{name}-session = %{epoch}:%{version}-%{release}
+Requires:	%{name}-session = %{epoch}:%{version}-%{release}
 Requires(post,preun):	%{name}-common = %{epoch}:%{version}-%{release}
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 Provides:	php-wddx = %{epoch}:%{version}-%{release}
@@ -1920,7 +1922,7 @@
 libtool --silent --mode=install install libphp_common.la $RPM_BUILD_ROOT%{_libdir}
 
 # install the apache modules' files
-make install-headers install-build install-modules install-programs \
+%{__make} install-headers install-build install-modules install-programs \
 	INSTALL_ROOT=$RPM_BUILD_ROOT
 
 # install CGI
@@ -2701,8 +2703,8 @@
 %files -n apache1-mod_php4
 %defattr(644,root,root,755)
 %doc sapi/apache/CREDITS
-%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) /etc/apache/conf.d/*_mod_php4.conf
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/php-apache.ini
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/apache/conf.d/*_mod_php4.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/php-apache.ini
 %attr(755,root,root) %{_libdir}/apache1/libphp4.so
 /home/services/apache/icons/*
 %endif
@@ -2711,8 +2713,8 @@
 %files -n apache-mod_php4
 %defattr(644,root,root,755)
 %doc sapi/apache2handler/{CREDITS,README}
-%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) /etc/httpd/httpd.conf/*_mod_php4.conf
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/php-apache2handler.ini
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/httpd/httpd.conf/*_mod_php4.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/php-apache2handler.ini
 %attr(755,root,root) %{_libdir}/apache/libphp4.so
 /home/services/httpd/icons/*
 %endif
@@ -2721,20 +2723,20 @@
 %defattr(644,root,root,755)
 %doc sapi/cgi/{CREDITS,README.FastCGI}
 %attr(755,root,root) %{_bindir}/php4.fcgi
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/php-cgi-fcgi.ini
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/php-cgi-fcgi.ini
 
 %files cgi
 %defattr(644,root,root,755)
 %doc sapi/cgi/CREDITS
 %attr(755,root,root) %{_bindir}/php4.cgi
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/php-cgi.ini
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/php-cgi.ini
 
 %files cli
 %defattr(644,root,root,755)
 %doc sapi/cli/{CREDITS,README}
 %attr(755,root,root) %{_bindir}/php4.cli
 %attr(755,root,root) %{_bindir}/php4
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/php-cli.ini
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/php-cli.ini
 %{_mandir}/man1/php4.1*
 
 %files program
@@ -2749,7 +2751,7 @@
 
 %dir %{_sysconfdir}
 %dir %{_sysconfdir}/conf.d
-%attr(644,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/php.ini
+%attr(644,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/php.ini
 %attr(770,root,http) %dir %verify(not group mode) /var/run/php
 %attr(755,root,root) %{_sbindir}/php4-module-install
 %attr(755,root,root) %{_libdir}/libphp_common-*.so
@@ -2775,83 +2777,83 @@
 %files bcmath
 %defattr(644,root,root,755)
 %doc ext/bcmath/CREDITS
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/bcmath.ini
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/bcmath.ini
 %attr(755,root,root) %{extensionsdir}/bcmath.so
 
 %files bzip2
 %defattr(644,root,root,755)
 %doc ext/bz2/CREDITS
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/bz2.ini
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/bz2.ini
 %attr(755,root,root) %{extensionsdir}/bz2.so
 
 %files calendar
 %defattr(644,root,root,755)
 %doc ext/calendar/CREDITS
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/calendar.ini
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/calendar.ini
 %attr(755,root,root) %{extensionsdir}/calendar.so
 
 %if %{with cpdf}
 %files cpdf
 %defattr(644,root,root,755)
 %doc ext/cpdf/CREDITS
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/cpdf.ini
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/cpdf.ini
 %attr(755,root,root) %{extensionsdir}/cpdf.so
 %endif
 
 %files crack
 %defattr(644,root,root,755)
 %doc ext/crack/CREDITS
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/crack.ini
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/crack.ini
 %attr(755,root,root) %{extensionsdir}/crack.so
 
 %files ctype
 %defattr(644,root,root,755)
 %doc ext/ctype/{CREDITS,README}
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/ctype.ini
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/ctype.ini
 %attr(755,root,root) %{extensionsdir}/ctype.so
 
 %if %{with curl}
 %files curl
 %defattr(644,root,root,755)
 %doc ext/curl/CREDITS
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/curl.ini
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/curl.ini
 %attr(755,root,root) %{extensionsdir}/curl.so
 %endif
 
 %files db
 %defattr(644,root,root,755)
 %doc ext/db/CREDITS
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/db.ini
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/db.ini
 %attr(755,root,root) %{extensionsdir}/db.so
 
 %files dba
 %defattr(644,root,root,755)
 %doc ext/dba/{CREDITS,README}
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/dba.ini
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/dba.ini
 %attr(755,root,root) %{extensionsdir}/dba.so
 
 %files dbase
 %defattr(644,root,root,755)
 %doc ext/dbase/CREDITS
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/dbase.ini
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/dbase.ini
 %attr(755,root,root) %{extensionsdir}/dbase.so
 
 %files dbx
 %defattr(644,root,root,755)
 %doc ext/dbx/{CREDITS,howto_extend_dbx.html}
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/dbx.ini
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/dbx.ini
 %attr(755,root,root) %{extensionsdir}/dbx.so
 
 %files dio
 %defattr(644,root,root,755)
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/dio.ini
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/dio.ini
 %attr(755,root,root) %{extensionsdir}/dio.so
 
 %if %{with xml}
 %files domxml
 %defattr(644,root,root,755)
 %doc ext/domxml/{CREDITS,TODO}
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/domxml.ini
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/domxml.ini
 %attr(755,root,root) %{extensionsdir}/domxml.so
 %endif
 
@@ -2859,70 +2861,70 @@
 %files fdf
 %defattr(644,root,root,755)
 %doc ext/fdf/CREDITS
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/fdf.ini
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/fdf.ini
 %attr(755,root,root) %{extensionsdir}/fdf.so
 %endif
 
 %files exif
 %defattr(644,root,root,755)
 %doc ext/exif/CREDITS
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/exif.ini
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/exif.ini
 %attr(755,root,root) %{extensionsdir}/exif.so
 
 %files filepro
 %defattr(644,root,root,755)
 %doc ext/filepro/CREDITS
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/filepro.ini
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/filepro.ini
 %attr(755,root,root) %{extensionsdir}/filepro.so
 
 %if %{with fribidi}
 %files fribidi
 %defattr(644,root,root,755)
 %doc ext/fribidi/{CREDITS,README}
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/fribidi.ini
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/fribidi.ini
 %attr(755,root,root) %{extensionsdir}/fribidi.so
 %endif
 
 %files ftp
 %defattr(644,root,root,755)
 %doc ext/ftp/CREDITS
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/ftp.ini
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/ftp.ini
 %attr(755,root,root) %{extensionsdir}/ftp.so
 
 %files gd
 %defattr(644,root,root,755)
 %doc ext/gd/CREDITS
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/gd.ini
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/gd.ini
 %attr(755,root,root) %{extensionsdir}/gd.so
 
 %files gettext
 %defattr(644,root,root,755)
 %doc ext/gettext/CREDITS
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/gettext.ini
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/gettext.ini
 %attr(755,root,root) %{extensionsdir}/gettext.so
 
 %files gmp
 %defattr(644,root,root,755)
 %doc ext/gmp/{CREDITS,README,TODO}
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/gmp.ini
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/gmp.ini
 %attr(755,root,root) %{extensionsdir}/gmp.so
 
 %files hyperwave
 %defattr(644,root,root,755)
 %doc ext/hyperwave/CREDITS
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/hyperwave.ini
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/hyperwave.ini
 %attr(755,root,root) %{extensionsdir}/hyperwave.so
 
 %files iconv
 %defattr(644,root,root,755)
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/iconv.ini
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/iconv.ini
 %attr(755,root,root) %{extensionsdir}/iconv.so
 
 %if %{with imap}
 %files imap
 %defattr(644,root,root,755)
 %doc ext/imap/CREDITS
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/imap.ini
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/imap.ini
 %attr(755,root,root) %{extensionsdir}/imap.so
 %endif
 
@@ -2930,7 +2932,7 @@
 %files interbase
 %defattr(644,root,root,755)
 %doc ext/interbase/CREDITS
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/interbase.ini
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/interbase.ini
 %attr(755,root,root) %{extensionsdir}/interbase.so
 %endif
 
@@ -2938,7 +2940,7 @@
 %files java
 %defattr(644,root,root,755)
 %doc ext/java/{CREDITS,README}
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/java.ini
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/java.ini
 %attr(755,root,root) %{extensionsdir}/java.so
 %{extensionsdir}/php_java.jar
 %endif
@@ -2947,47 +2949,47 @@
 %files ldap
 %defattr(644,root,root,755)
 %doc ext/ldap/CREDITS
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/ldap.ini
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/ldap.ini
 %attr(755,root,root) %{extensionsdir}/ldap.so
 %endif
 
 %files mbstring
 %defattr(644,root,root,755)
 %doc ext/mbstring/{CREDITS,README,README.libmbfl}
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/mbstring.ini
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/mbstring.ini
 %attr(755,root,root) %{extensionsdir}/mbstring.so
 
 %files mcal
 %defattr(644,root,root,755)
 %doc ext/mcal/CREDITS
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/mcal.ini
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/mcal.ini
 %attr(755,root,root) %{extensionsdir}/mcal.so
 
 %files mcrypt
 %defattr(644,root,root,755)
 %doc ext/mcrypt/{CREDITS,TODO}
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/mcrypt.ini
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/mcrypt.ini
 %attr(755,root,root) %{extensionsdir}/mcrypt.so
 
 %if %{with mhash}
 %files mhash
 %defattr(644,root,root,755)
 %doc ext/mhash/CREDITS
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/mhash.ini
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/mhash.ini
 %attr(755,root,root) %{extensionsdir}/mhash.so
 %endif
 
 %files mime_magic
 %defattr(644,root,root,755)
 %doc ext/mime_magic/{CREDITS,TODO}
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/mime_magic.ini
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/mime_magic.ini
 %attr(755,root,root) %{extensionsdir}/mime_magic.so
 
 %if %{with ming}
 %files ming
 %defattr(644,root,root,755)
 %doc ext/ming/CREDITS
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/ming.ini
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/ming.ini
 %attr(755,root,root) %{extensionsdir}/ming.so
 %endif
 
@@ -2995,7 +2997,7 @@
 %files mnogosearch
 %defattr(644,root,root,755)
 %doc ext/mnogosearch/{CREDITS,README}
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/mnogosearch.ini
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/mnogosearch.ini
 %attr(755,root,root) %{extensionsdir}/mnogosearch.so
 %endif
 
@@ -3003,7 +3005,7 @@
 %files msession
 %defattr(644,root,root,755)
 %doc ext/msession/{CREDITS,README,msession-test.php}
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/msession.ini
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/msession.ini
 %attr(755,root,root) %{extensionsdir}/msession.so
 %endif
 
@@ -3011,14 +3013,14 @@
 %files mssql
 %defattr(644,root,root,755)
 %doc ext/mssql/CREDITS
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/mssql.ini
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/mssql.ini
 %attr(755,root,root) %{extensionsdir}/mssql.so
 %endif
 
 %files mysql
 %defattr(644,root,root,755)
 %doc ext/mysql/CREDITS
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/mysql.ini
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/mysql.ini
 %attr(755,root,root) %{extensionsdir}/mysql.so
 
 %files ncurses
@@ -3030,7 +3032,7 @@
 %files oci8
 %defattr(644,root,root,755)
 %doc ext/oci8/CREDITS
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/oci8.ini
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/oci8.ini
 %attr(755,root,root) %{extensionsdir}/oci8.so
 %endif
 
@@ -3038,7 +3040,7 @@
 %files odbc
 %defattr(644,root,root,755)
 %doc ext/odbc/CREDITS
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/odbc.ini
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/odbc.ini
 %attr(755,root,root) %{extensionsdir}/odbc.so
 %endif
 
@@ -3046,14 +3048,14 @@
 %files oracle
 %defattr(644,root,root,755)
 %doc ext/oracle/CREDITS
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/oracle.ini
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/oracle.ini
 %attr(755,root,root) %{extensionsdir}/oracle.so
 %endif
 
 %files overload
 %defattr(644,root,root,755)
 %doc ext/overload/{CREDITS,README}
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/overload.ini
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/overload.ini
 %attr(755,root,root) %{extensionsdir}/overload.so
 
 %files pcntl
@@ -3065,7 +3067,7 @@
 %files pcre
 %defattr(644,root,root,755)
 %doc ext/pcre/CREDITS
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/pcre.ini
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/pcre.ini
 %attr(755,root,root) %{extensionsdir}/pcre.so
 %endif
 
@@ -3073,7 +3075,7 @@
 %files pdf
 %defattr(644,root,root,755)
 %doc ext/pdf/CREDITS
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/pdf.ini
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/pdf.ini
 %attr(755,root,root) %{extensionsdir}/pdf.so
 %endif
 
@@ -3081,21 +3083,21 @@
 %files pgsql
 %defattr(644,root,root,755)
 %doc ext/pgsql/{CREDITS,README}
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/pgsql.ini
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/pgsql.ini
 %attr(755,root,root) %{extensionsdir}/pgsql.so
 %endif
 
 %files posix
 %defattr(644,root,root,755)
 %doc ext/posix/CREDITS
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/posix.ini
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/posix.ini
 %attr(755,root,root) %{extensionsdir}/posix.so
 
 %if %{with pspell}
 %files pspell
 %defattr(644,root,root,755)
 %doc ext/overload/{CREDITS,README}
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/pspell.ini
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/pspell.ini
 %attr(755,root,root) %{extensionsdir}/pspell.so
 %endif
 
@@ -3103,7 +3105,7 @@
 %files qtdom
 %defattr(644,root,root,755)
 %doc ext/qtdom/CREDITS
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/qtdom.ini
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/qtdom.ini
 %attr(755,root,root) %{extensionsdir}/qtdom.so
 %endif
 
@@ -3116,7 +3118,7 @@
 %files recode
 %defattr(644,root,root,755)
 %doc ext/recode/CREDITS
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/recode.ini
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/recode.ini
 %attr(755,root,root) %{extensionsdir}/recode.so
 %endif
 
@@ -3129,66 +3131,66 @@
 %files shmop
 %defattr(644,root,root,755)
 %doc ext/shmop/{CREDITS,README}
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/shmop.ini
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/shmop.ini
 %attr(755,root,root) %{extensionsdir}/shmop.so
 
 %if %{with snmp}
 %files snmp
 %defattr(644,root,root,755)
 %doc ext/snmp/CREDITS
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/snmp.ini
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/snmp.ini
 %attr(755,root,root) %{extensionsdir}/snmp.so
 %endif
 
 %files sockets
 %defattr(644,root,root,755)
 %doc ext/sockets/CREDITS
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/sockets.ini
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/sockets.ini
 %attr(755,root,root) %{extensionsdir}/sockets.so
 
 %if %{with sybase}
 %files sybase
 %defattr(644,root,root,755)
 %doc ext/sybase/CREDITS
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/sybase.ini
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/sybase.ini
 %attr(755,root,root) %{extensionsdir}/sybase.so
 
 %files sybase-ct
 %defattr(644,root,root,755)
 %doc ext/sybase_ct/CREDITS
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/sybase_ct.ini
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/sybase_ct.ini
 %attr(755,root,root) %{extensionsdir}/sybase_ct.so
 %endif
 
 %files sysvmsg
 %defattr(644,root,root,755)
 %doc ext/sysvmsg/CREDITS
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/sysvmsg.ini
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/sysvmsg.ini
 %attr(755,root,root) %{extensionsdir}/sysvmsg.so
 
 %files sysvsem
 %defattr(644,root,root,755)
 %doc ext/sysvsem/CREDITS
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/sysvsem.ini
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/sysvsem.ini
 %attr(755,root,root) %{extensionsdir}/sysvsem.so
 
 %files sysvshm
 %defattr(644,root,root,755)
 %doc ext/sysvshm/CREDITS
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/sysvshm.ini
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/sysvshm.ini
 %attr(755,root,root) %{extensionsdir}/sysvshm.so
<<Diff was trimmed, longer than 597 lines>>

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




More information about the pld-cvs-commit mailing list