packages: php/php.spec - rel 0.15 - move per-SAPI additional ini files to p...
baggins
baggins at pld-linux.org
Wed Mar 10 23:51:21 CET 2010
Author: baggins Date: Wed Mar 10 22:51:21 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- rel 0.15
- move per-SAPI additional ini files to per-SAPI config dirs
- added triggers to move configs on upgrade (should apache* triggers be merged?)
---- Files affected:
packages/php:
php.spec (1.848 -> 1.849)
---- Diffs:
================================================================
Index: packages/php/php.spec
diff -u packages/php/php.spec:1.848 packages/php/php.spec:1.849
--- packages/php/php.spec:1.848 Fri Feb 26 18:45:05 2010
+++ packages/php/php.spec Wed Mar 10 23:51:16 2010
@@ -94,7 +94,7 @@
%endif
%define subver RC3
-%define rel 0.14
+%define rel 0.15
Summary: PHP: Hypertext Preprocessor
Summary(fr.UTF-8): Le langage de script embarque-HTML PHP
Summary(pl.UTF-8): Język skryptowy PHP
@@ -2103,20 +2103,21 @@
sed -e 's#%{_prefix}/lib/php#%{_libdir}/php#g' php.ini > $RPM_BUILD_ROOT%{_sysconfdir}/php.ini
-install -d $RPM_BUILD_ROOT%{_sysconfdir}
-cp -a %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/php-cli.ini
-cp -a %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/php-cgi-fcgi.ini
+# per SAPI ini directories
+install -d $RPM_BUILD_ROOT%{_sysconfdir}/{cgi-fcgi,cli,apache,apache2handler}.d
+cp -a %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/cli.d/php-cli.ini
+cp -a %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/cgi-fcgi.d/php-cgi-fcgi.ini
cp -a %{SOURCE9} $RPM_BUILD_ROOT%{_sysconfdir}/browscap.ini
%if %{with apache1}
cp -a %{SOURCE2} $RPM_BUILD_ROOT/etc/apache/conf.d/70_mod_php.conf
-cp -a %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/php-apache.ini
+cp -a %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/apache.d/php-apache.ini
rm -f $RPM_BUILD_ROOT%{_libdir}/apache1/libphp5.la
%endif
%if %{with apache2}
cp -a %{SOURCE2} $RPM_BUILD_ROOT/etc/httpd/conf.d/70_mod_php.conf
-cp -a %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/php-apache2handler.ini
+cp -a %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/apache2handler.d/php-apache2handler.ini
rm -f $RPM_BUILD_ROOT%{_libdir}/apache/libphp5.la
%endif
@@ -2141,9 +2142,6 @@
}
generate_inifiles
-# per SAPI ini directories
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/{cgi-fcgi,cli,apache,apache2handler}.d
-
# for CLI SAPI only
mv $RPM_BUILD_ROOT%{_sysconfdir}/{conf.d/{pcntl,readline}.ini,cli.d}
@@ -2230,17 +2228,47 @@
/^\(Add\|Load\)Module.*php5\.\(so\|c\)/d
' /etc/apache/apache.conf
%service -q apache restart
+
+%triggerpostun -n apache1-mod_php -- apache1-mod_php < 4:5.3.2-0.15
+# rescue configs.
+if [ -f %{_sysconfdir}/php-apache.ini.rpmsave ]; then
+ mv -f %{_sysconfdir}/apache.d/php-apache.ini{,.rpmnew}
+ mv -f %{_sysconfdir}/php-apache.ini.rpmsave %{_sysconfdir}/apache.d/php-apache.ini
+fi
%endif
%if %{with apache2}
-%triggerpostun -n apache-mod_php -- php < 4:5.0.4-7.1, php < 4:5.0.4-7.1
+%triggerpostun -n apache-mod_php -- php < 4:5.0.4-7.1
# for fixed php-SAPI.ini, the poor php-apache.ini was never read for apache2
if [ -f %{_sysconfdir}/php-apache.ini.rpmsave ]; then
cp -f %{_sysconfdir}/php-apache2handler.ini{,.rpmnew}
mv -f %{_sysconfdir}/php-apache.ini.rpmsave %{_sysconfdir}/php-apache2handler.ini
fi
+
+%triggerpostun -n apache-mod_php -- apache-mod_php < 4:5.3.2-0.15
+# rescue configs.
+if [ -f %{_sysconfdir}/php-apache2handler.ini.rpmsave ]; then
+ mv -f %{_sysconfdir}/php-apache2handler.d/php-apache2handler.ini{,.rpmnew}
+ mv -f %{_sysconfdir}/php-apache2handler.ini.rpmsave %{_sysconfdir}/php-apache2handler.d/php-apache2handler.ini
+fi
%endif
+%triggerpostun cgi -- php-cgi < 4:5.3.2-0.15
+# rescue configs.
+for f in php-cgi.ini php-cgi-fcgi.ini ; do
+ if [ -f %{_sysconfdir}/$f.rpmsave ]; then
+ mv -f %{_sysconfdir}/cgi-fcgi.d/$f{,.rpmnew}
+ mv -f %{_sysconfdir}/$f.rpmsave %{_sysconfdir}/cgi-fcgi.d/$f
+ fi
+done
+
+%triggerpostun cli -- php-cli < 4:5.3.2-0.15
+# rescue configs.
+if [ -f %{_sysconfdir}/php-cli.ini.rpmsave ]; then
+ mv -f %{_sysconfdir}/cli.d/php-cli.ini{,.rpmnew}
+ mv -f %{_sysconfdir}/php-cli.ini.rpmsave %{_sysconfdir}/cli.d/php-cli.ini
+fi
+
# common macros called at extension post/postun scriptlet
%define extension_scripts() \
%post %1 \
@@ -2479,7 +2507,7 @@
%defattr(644,root,root,755)
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/apache/conf.d/*_mod_php.conf
%dir %{_sysconfdir}/apache.d
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/php-apache.ini
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/apache.d/php-apache.ini
%attr(755,root,root) %{_libdir}/apache1/libphp5.so
%endif
@@ -2488,7 +2516,7 @@
%defattr(644,root,root,755)
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/httpd/conf.d/*_mod_php.conf
%dir %{_sysconfdir}/apache2handler.d
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/php-apache2handler.ini
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/apache2handler.d/php-apache2handler.ini
%attr(755,root,root) %{_libdir}/apache/libphp5.so
%endif
@@ -2501,14 +2529,14 @@
%files cgi
%defattr(644,root,root,755)
%dir %{_sysconfdir}/cgi-fcgi.d
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/php-cgi-fcgi.ini
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/cgi-fcgi.d/php-cgi-fcgi.ini
%attr(755,root,root) %{_bindir}/php.cgi
%attr(755,root,root) %{_bindir}/php.fcgi
%files cli
%defattr(644,root,root,755)
%dir %{_sysconfdir}/cli.d
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/php-cli.ini
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/cli.d/php-cli.ini
%attr(755,root,root) %{_bindir}/php.cli
%{_mandir}/man1/php.1*
%{_mandir}/man1/php.cli.1*
@@ -2991,6 +3019,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.849 2010/03/10 22:51:16 baggins
+- rel 0.15
+- move per-SAPI additional ini files to per-SAPI config dirs
+- added triggers to move configs on upgrade (should apache* triggers be merged?)
+
Revision 1.848 2010/02/26 17:45:05 glen
- static provides from PHP_5_2
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php/php.spec?r1=1.848&r2=1.849&f=u
More information about the pld-cvs-commit
mailing list