SPECS: php4.spec - search additionally for .ini files from PHP_CON...
glen
glen at pld-linux.org
Tue Apr 4 18:22:07 CEST 2006
Author: glen Date: Tue Apr 4 16:22:07 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- search additionally for .ini files from PHP_CONFIG_FILE_PATH/SAPI.d directory
- virtual php(program) dropped, use /usr/bin/php only
---- Files affected:
SPECS:
php4.spec (1.531 -> 1.532)
---- Diffs:
================================================================
Index: SPECS/php4.spec
diff -u SPECS/php4.spec:1.531 SPECS/php4.spec:1.532
--- SPECS/php4.spec:1.531 Tue Apr 4 17:05:47 2006
+++ SPECS/php4.spec Tue Apr 4 18:22:01 2006
@@ -71,7 +71,7 @@
%undefine with_msession
%endif
-%define _rel 9.3
+%define _rel 9.5
Summary: PHP: Hypertext Preprocessor
Summary(fr): Le langage de script embarque-HTML PHP
Summary(pl): Język skryptowy PHP
@@ -382,8 +382,7 @@
Summary(pl): Dowiązanie symboliczne /usr/bin/php
Group: Development/Languages/PHP
Requires: %{name}-cli = %{epoch}:%{version}-%{release}
-Provides: php(program)
-Obsoletes: php(program)
+Obsoletes: /usr/bin/php
%description program
Package providing /usr/bin/php symlink to PHP CLI.
@@ -1903,7 +1902,7 @@
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_libdir}/{php,apache{,1}},%{_sysconfdir}/{apache,cgi}} \
+install -d $RPM_BUILD_ROOT{%{_libdir}/{php,apache{,1}},%{_sysconfdir}} \
$RPM_BUILD_ROOT/home/services/{httpd,apache}/icons \
$RPM_BUILD_ROOT{%{_sbindir},%{_bindir}} \
$RPM_BUILD_ROOT{/etc/apache/conf.d,/etc/httpd/httpd.conf} \
@@ -1982,8 +1981,11 @@
EOF
done
-# Not in all SAPI, so don't need the .ini fragments.
-rm -f $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/{ncurses,pcntl,readline}.ini
+# per SAPI ini directories
+install -d $RPM_BUILD_ROOT%{_sysconfdir}/{cgi,cli,cgi-fcgi,apache,apache2handler}.d
+
+# for CLI SAPI only
+mv $RPM_BUILD_ROOT%{_sysconfdir}/{conf.d/{ncurses,pcntl,readline}.ini,cli.d}
%clean
rm -rf $RPM_BUILD_ROOT
@@ -2271,24 +2273,6 @@
%postun mysql
%extension_postun
-%triggerin ncurses -- %{name}-cgi, %{name}-cli
-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
-
-%triggerun ncurses -- %{name}-cgi, %{name}-cli
-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
%extension_post
@@ -2313,24 +2297,6 @@
%postun overload
%extension_postun
-%triggerin pcntl -- %{name}-cgi, %{name}-cli
-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
-
-%triggerun pcntl -- %{name}-cgi, %{name}-cli
-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
%extension_post
@@ -2367,24 +2333,6 @@
%postun qtdom
%extension_postun
-%triggerin readline -- %{name}-cgi, %{name}-cli
-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
-
-%triggerun readline -- %{name}-cgi, %{name}-cli
-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
%extension_post
@@ -2614,6 +2562,14 @@
%triggerun mysql -- %{name}-mysql < 3:4.4.0-2.1
[ ! -x %{_sbindir}/php4-module-install ] || %{_sbindir}/php4-module-install remove mysql %{_sysconfdir}/php.ini
+%triggerun ncurses -- %{name}-ncurses < 3:4.4.2-9.4
+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
+
%triggerun oci8 -- %{name}-oci8 < 3:4.4.0-2.1
[ ! -x %{_sbindir}/php4-module-install ] || %{_sbindir}/php4-module-install remove oci8 %{_sysconfdir}/php.ini
@@ -2626,6 +2582,14 @@
%triggerun overload -- %{name}-overload < 3:4.4.0-2.1
[ ! -x %{_sbindir}/php4-module-install ] || %{_sbindir}/php4-module-install remove overload %{_sysconfdir}/php.ini
+%triggerun pcntl -- %{name}-pcntl < 3:4.4.2-9.4
+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
+
%triggerun pcre -- %{name}-pcre < 3:4.4.0-2.1
[ ! -x %{_sbindir}/php4-module-install ] || %{_sbindir}/php4-module-install remove pcre %{_sysconfdir}/php.ini
@@ -2644,6 +2608,14 @@
%triggerun qtdom -- %{name}-qtdom < 3:4.4.0-2.1
[ ! -x %{_sbindir}/php4-module-install ] || %{_sbindir}/php4-module-install remove qtdom %{_sysconfdir}/php.ini
+%triggerun readline -- %{name}-readline < 3:4.4.2-9.4
+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
+
%triggerun recode -- %{name}-recode < 3:4.4.0-2.1
[ ! -x %{_sbindir}/php4-module-install ] || %{_sbindir}/php4-module-install remove recode %{_sysconfdir}/php.ini
@@ -2703,6 +2675,7 @@
%defattr(644,root,root,755)
%doc sapi/apache/CREDITS
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/apache/conf.d/*_mod_php4.conf
+%dir %{_sysconfdir}/apache.d
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/php-apache.ini
%attr(755,root,root) %{_libdir}/apache1/libphp4.so
/home/services/apache/icons/*
@@ -2713,6 +2686,7 @@
%defattr(644,root,root,755)
%doc sapi/apache2handler/{CREDITS,README}
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/httpd/httpd.conf/*_mod_php4.conf
+%dir %{_sysconfdir}/apache2handler.d
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/php-apache2handler.ini
%attr(755,root,root) %{_libdir}/apache/libphp4.so
/home/services/httpd/icons/*
@@ -2723,6 +2697,7 @@
%defattr(644,root,root,755)
%doc sapi/cgi/{CREDITS,README.FastCGI}
%attr(755,root,root) %{_bindir}/php4.fcgi
+%dir %{_sysconfdir}/cgi-fcgi.d
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/php-cgi-fcgi.ini
%endif
@@ -2730,6 +2705,7 @@
%defattr(644,root,root,755)
%doc sapi/cgi/CREDITS
%attr(755,root,root) %{_bindir}/php4.cgi
+%dir %{_sysconfdir}/cgi.d
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/php-cgi.ini
%files cli
@@ -2737,6 +2713,7 @@
%doc sapi/cli/{CREDITS,README}
%attr(755,root,root) %{_bindir}/php4.cli
%attr(755,root,root) %{_bindir}/php4
+%dir %{_sysconfdir}/cli.d
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/php-cli.ini
%{_mandir}/man1/php4.1*
@@ -3025,6 +3002,7 @@
%files ncurses
%defattr(644,root,root,755)
%doc ext/ncurses/CREDITS
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/cli.d/ncurses.ini
%attr(755,root,root) %{extensionsdir}/ncurses.so
%if %{with oci8}
@@ -3060,6 +3038,7 @@
%files pcntl
%defattr(644,root,root,755)
%doc ext/pcntl/{CREDITS,README}
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/cli.d/pcntl.ini
%attr(755,root,root) %{extensionsdir}/pcntl.so
%if %{with pcre}
@@ -3111,6 +3090,7 @@
%files readline
%defattr(644,root,root,755)
%doc ext/readline/{CREDITS,README.libedit}
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/cli.d/readline.ini
%attr(755,root,root) %{extensionsdir}/readline.so
%if %{with recode}
@@ -3249,6 +3229,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.532 2006/04/04 16:22:01 glen
+- search additionally for .ini files from PHP_CONFIG_FILE_PATH/SAPI.d directory
+- virtual php(program) dropped, use /usr/bin/php only
+
Revision 1.531 2006/04/04 15:05:47 glen
- experimental versioning
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/php4.spec?r1=1.531&r2=1.532&f=u
More information about the pld-cvs-commit
mailing list