commit 263ef8fed1db4afd61233a235decd87c02e3bbd1
Author: Elan Ruusamäe <[email protected]>
Date: Sun May 18 01:53:15 2014 +0300
migrate configs /etc/php/conf.d -> /etc/phpXY/conf.d/
php.spec | 19 ++++++++++++++++++-
1 file changed, 18 insertions(+), 1 deletion(-)
---
diff --git a/php.spec b/php.spec
index f85d2a6..79357ca 100644
--- a/php.spec
+++ b/php.spec
@@ -379,7 +379,6 @@ PHP - це мова написання скриптів, що вбудовуют
Summary: PHP DSO module for Apache 1.3.x
Summary(pl.UTF-8): Moduł DSO (Dynamic Shared Object) PHP dla Apache 1.3.x
Group: Development/Languages/PHP
-Requires(triggerpostun): sed >= 4.0
Requires: %{name}-common = %{epoch}:%{version}-%{release}
Requires: apache1(EAPI) >= 1.3.33-2
Requires: apache1-mod_mime
@@ -2710,6 +2709,24 @@ fi
[ ! -f /etc/apache/conf.d/??_mod_php.conf ] || %service -q apache restart
[ ! -f /etc/httpd/conf.d/??_mod_php.conf ] || %service -q httpd restart
+%triggerpostun common -- php-common < 4:5.3.28-7
+# migrate configs /etc/php/conf.d -> /etc/phpXY/conf.d/
+# do config migration in php-common trigger, as the trigger is ran after all
packages are upgraded
+# this way we can stick to one trigger, instead of attaching one for each
(sub)package!
+for f in /etc/php/*.ini.rpmsave /etc/php/*.d/*.ini.rpmsave; do
+ test -f "$f" || continue
+ bn=${f#/etc/php/}
+ dn=${bn%/*}
+ fn=${bn#*/}
+ test "$dn" = "$fn" && dn=
+ fn=${fn%.rpmsave}
+ nf=%{_sysconfdir}/$dn/$fn
+ test -f "$nf" || continue
+ cp -vf $nf{,.rpmnew}
+ mv -vf $f $nf
+ %{__sed} -i -e 's#%{_libdir}/php#%{_libdir}/%{name}#' $nf
+done
+
# common macros called at extension post/postun scriptlet
%define extension_scripts() \
%post %1 \
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/a6af2a14725fbe41fc6bc341a956ac00745bfff7
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
