- release 3

[packages/phpMyAdmin.git] / phpMyAdmin.spec

diff --git a/phpMyAdmin.spec b/phpMyAdmin.spec
index b3eb68d7c036e30980ef2dfbe521294cbb5758f2..792674639dfaf46355e4e4df0cff5390a6b4706d 100644 (file)
--- a/phpMyAdmin.spec
+++ b/phpMyAdmin.spec
@@ -1,15 +1,19 @@
 Summary:       phpMyAdmin - web-based MySQL administration
 Summary(pl):   phpMyAdmin - administracja bazami MySQL przez WWW
 Name:          phpMyAdmin
-%define                _pl     rc2
-%define                _rel    2
+%define                _pl     pl2
+%define                _rel    3
 # NOTE: bump _rel with every new patchlevel
 Version:       2.6.0
-Release:       0.%{_pl}.%{_rel}
+#Release:      1
+Release:       %{_rel}.%{_pl}
+#Release:      0.%{_pl}.%{_rel}
 License:       GPL v2
 Group:         Applications/Databases/Interfaces
 Source0:       http://dl.sourceforge.net/phpmyadmin/%{name}-%{version}-%{_pl}.tar.bz2
-# Source0-md5: 134fcb19e76a4bbab121d4aeefd2422b
+# Source0-md5: f9000262ce736ec21369e1be1522ea0d
+# Source0-size:        1278267
+#Source0:      http://dl.sourceforge.net/phpmyadmin/%{name}-%{version}.tar.bz2
 Source1:       %{name}.conf
 Patch0:                %{name}-config.patch
 URL:           http://www.phpmyadmin.net/
@@ -61,6 +65,7 @@ MySQL). Aktualnie phpMyAdmin potrafi:
 
 %prep
 %setup -q -n %{name}-%{version}-%{_pl}
+#%setup -q
 %patch -p1
 
 %install
@@ -93,11 +98,14 @@ rm -rf $RPM_BUILD_ROOT
 %post
 if [ -f /etc/httpd/httpd.conf ] && ! grep -q "^Include.*%{name}.conf" /etc/httpd/httpd.conf; then
        echo "Include /etc/httpd/%{name}.conf" >> /etc/httpd/httpd.conf
+       if [ -f /var/lock/subsys/httpd ]; then
+               /usr/sbin/apachectl restart 1>&2
+       fi
 elif [ -d /etc/httpd/httpd.conf ]; then
        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
+       if [ -f /var/lock/subsys/httpd ]; then
+               /usr/sbin/apachectl restart 1>&2
+       fi
 fi
 
 %preun
@@ -109,9 +117,9 @@ if [ "$1" = "0" ]; then
                grep -v "^Include.*%{name}.conf" /etc/httpd/httpd.conf > \
                        /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
-               fi
+       fi
+       if [ -f /var/lock/subsys/httpd ]; then
+           /usr/sbin/apachectl restart 1>&2
        fi
 fi