SPECS: phpMyAdmin.spec - never use '<=' in trigger comparision (dr...
glen
glen at pld-linux.org
Wed Feb 6 21:56:27 CET 2008
Author: glen Date: Wed Feb 6 20:56:27 2008 GMT
Module: SPECS Tag: HEAD
---- Log message:
- never use '<=' in trigger comparision (drop old triggers); rel 2
---- Files affected:
SPECS:
phpMyAdmin.spec (1.171 -> 1.172)
---- Diffs:
================================================================
Index: SPECS/phpMyAdmin.spec
diff -u SPECS/phpMyAdmin.spec:1.171 SPECS/phpMyAdmin.spec:1.172
--- SPECS/phpMyAdmin.spec:1.171 Sat Jan 12 20:56:16 2008
+++ SPECS/phpMyAdmin.spec Wed Feb 6 21:56:22 2008
@@ -3,7 +3,7 @@
Summary(pl.UTF-8): phpMyAdmin - administracja bazami MySQL przez WWW
Name: phpMyAdmin
Version: 2.11.4
-Release: 1
+Release: 2
License: GPL v2
Group: Applications/Databases/Interfaces
Source0: http://dl.sourceforge.net/phpmyadmin/%{name}-%{version}-all-languages.tar.bz2
@@ -115,44 +115,6 @@
%triggerun -- apache < 2.2.0, apache-base
%webapp_unregister httpd %{_webapp}
-%triggerpostun -- phpMyAdmin <= 2.5.3-2
-for i in `grep -lr "/home/\(services/\)*httpd/html/myadmin" /etc/httpd/*`; do
- cp $i $i.backup
- sed -i -e "s#/home/httpd/html/myadmin#%{_appdir}#g" $i
- sed -i -e "s#/home/services/httpd/html/myadmin#%{_appdir}#g" $i
- echo "File changed by trigger: $i (backup: $i.backup)"
-done
-
-%triggerpostun -- %{name} < 2.7.0-pl1.2.5
-# rescue app config from various old locations
-if [ -f /home/services/httpd/html/myadmin/config.inc.php.rpmsave ]; then
- mv -f %{_sysconfdir}/config.inc.php{,.rpmnew}
- mv -f /home/services/httpd/html/myadmin/config.inc.php.rpmsav %{_sysconfdir}/config.inc.php
-fi
-if [ -f /home/httpd/html/myadmin/config.inc.php.rpmsave ]; then
- mv -f %{_sysconfdir}/config.inc.php{,.rpmnew}
- mv -f /home/httpd/html/myadmin/config.inc.php.rpmsave %{_sysconfdir}/config.inc.php
-fi
-if [ -f /etc/%{name}/config.inc.php.rpmsave ]; then
- mv -f %{_sysconfdir}/config.inc.php{,.rpmnew}
- mv -f /etc/%{name}/config.inc.php.rpmsave %{_sysconfdir}/config.inc.php
-fi
-
-# nuke very-old config location (this mostly for Ra)
-if [ -f /etc/httpd/httpd.conf ]; then
- sed -i -e "/^Include.*%{name}.conf/d" /etc/httpd/httpd.conf
-fi
-
-# migrate from httpd (apache2) config dir
-if [ -f /etc/httpd/%{name}.conf.rpmsave ]; then
- cp -f %{_sysconfdir}/httpd.conf{,.rpmnew}
- mv -f /etc/httpd/%{name}.conf.rpmsave %{_sysconfdir}/httpd.conf
-fi
-
-rm -f /etc/httpd/httpd.conf/99_%{name}.conf
-/usr/sbin/webapp register httpd %{_webapp}
-%service httpd reload
-
%files
%defattr(644,root,root,755)
%doc Documentation.* CREDITS ChangeLog INSTALL README TODO translators.html scripts libraries/tcpdf/README-tcpdf libraries/import/README-import libraries/transformations/README-transformations libraries/transformations/TEMPLATE* libraries/transformations/*.sh lang/*.sh
@@ -176,6 +138,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.172 2008-02-06 20:56:22 glen
+- never use '<=' in trigger comparision (drop old triggers); rel 2
+
Revision 1.171 2008-01-12 19:56:16 dzeus
- up to 2.11.4 (bugfixes)
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/phpMyAdmin.spec?r1=1.171&r2=1.172&f=u
More information about the pld-cvs-commit
mailing list