From c30dcd8fa122db6f18171fbdd32b6dcdfa1346f6 Mon Sep 17 00:00:00 2001 From: twittner Date: Wed, 21 Jul 2004 14:05:35 +0000 Subject: [PATCH] - fixed %post - make symlinks rather than move files already matched by %files (noticed by qboosh). - fixed release: 2.pl1 -> pl1.1 ; bumped Epoch (1) Changed files: phpMyAdmin.spec -> 1.70 --- phpMyAdmin.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/phpMyAdmin.spec b/phpMyAdmin.spec index afc58dd..cfba44a 100644 --- a/phpMyAdmin.spec +++ b/phpMyAdmin.spec @@ -3,7 +3,8 @@ Summary(pl): phpMyAdmin - administracja bazami MySQL przez WWW Name: phpMyAdmin %define _ver pl1 Version: 2.5.7 -Release: 2.pl1 +Release: %{_ver}.1 +Epoch: 1 License: GPL v2 Group: Applications/Databases/Interfaces Source0: http://dl.sourceforge.net/phpmyadmin/%{name}-%{version}-%{_ver}.tar.bz2 @@ -86,7 +87,7 @@ rm -rf $RPM_BUILD_ROOT if [ -f /etc/httpd/httpd.conf ] && ! grep -q "^Include.*phpMyAdmin.conf" /etc/httpd/httpd.conf; then echo "Include /etc/httpd/phpMyAdmin.conf" >> /etc/httpd/httpd.conf elif [ -d /etc/httpd/httpd.conf ]; then - mv -f /etc/httpd/%{name}.conf /etc/httpd/httpd.conf/99_%{name}.conf + ln -sf /etc/httpd/%{name}.conf /etc/httpd/httpd.conf/99_%{name}.conf fi if [ -f /var/lock/subsys/httpd ]; then /usr/sbin/apachectl restart 1>&2 @@ -99,7 +100,7 @@ if [ "$1" = "0" ]; then rm -f /etc/httpd/httpd.conf/99_%{name}.conf else grep -v "^Include.*phpMyAdmin.conf" /etc/httpd/httpd.conf > \ - etc/httpd/httpd.conf.tmp + /etc/httpd/httpd.conf.tmp mv -f /etc/httpd/httpd.conf.tmp /etc/httpd/httpd.conf if [ -f /var/lock/subsys/httpd ]; then /usr/sbin/apachectl restart 1>&2 -- 2.44.0