- updated to 2.7.0-pl1

[packages/phpMyAdmin.git] / phpMyAdmin.spec

diff --git a/phpMyAdmin.spec b/phpMyAdmin.spec
index 1a468303b32e158ce4348bcab6335fa4ad9d318a..c4fcac2a40f748f7f6bbc85399bdd4e149942e00 100644 (file)
--- a/phpMyAdmin.spec
+++ b/phpMyAdmin.spec
@@ -1,23 +1,24 @@
 Summary:       phpMyAdmin - web-based MySQL administration
 Summary(pl):   phpMyAdmin - administracja bazami MySQL przez WWW
 Name:          phpMyAdmin
-Version:       2.6.1
-%define                _pl     pl2
-Release:       3.%{_pl}.1
+Version:       2.7.0
+%define                _pl     pl1
+#Release:      1
+Release:       2.%{_pl}.1
 License:       GPL v2
 Group:         Applications/Databases/Interfaces
 Source0:       http://dl.sourceforge.net/phpmyadmin/%{name}-%{version}-%{_pl}.tar.bz2
-# Source0-md5: 787feeebe16ef7ab43e75e4046550da2
+# Source0-md5: 39bfebd35f9a2de03504812df173f27d
 #Source0:      http://dl.sourceforge.net/phpmyadmin/%{name}-%{version}.tar.bz2
 Source1:       %{name}.conf
 Patch0:                %{name}-config.patch
 URL:           http://www.phpmyadmin.net/
-#Requires:     mysql
 Requires(postun):      perl-base
+Requires:      php
 Requires:      php-mysql
 Requires:      php-pcre
-Requires:      php
 Requires:      webserver
+#Suggests:     php-mbstring
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -59,6 +60,7 @@ podr
 - tworzyæ i czytaæ zrzuty tabel
 
 %prep
+#%setup -q
 %setup -q -n %{name}-%{version}-%{_pl}
 %patch -p1
 
@@ -68,9 +70,8 @@ install -d $RPM_BUILD_ROOT%{_myadmindir}/{css,lang,libraries/{auth,export,dbg,db
        $RPM_BUILD_ROOT{%{_sysconfdir},/etc/httpd}
 
 install *.php *.html *.css $RPM_BUILD_ROOT%{_myadmindir}
-#install images/*.{gif,png} $RPM_BUILD_ROOT%{_myadmindir}/images
 install lang/*.php $RPM_BUILD_ROOT%{_myadmindir}/lang
-cp -rf themes $RPM_BUILD_ROOT%{_myadmindir}/
+cp -rf themes $RPM_BUILD_ROOT%{_myadmindir}
 install css/* $RPM_BUILD_ROOT%{_myadmindir}/css
 install libraries/*.{js,php} $RPM_BUILD_ROOT%{_myadmindir}/libraries
 install libraries/auth/*.php $RPM_BUILD_ROOT%{_myadmindir}/libraries/auth
@@ -81,7 +82,7 @@ install libraries/transformations/*.php $RPM_BUILD_ROOT%{_myadmindir}/libraries/
 
 cp -rf scripts $RPM_BUILD_ROOT%{_myadmindir}
 
-install config.inc.php $RPM_BUILD_ROOT%{_sysconfdir}
+install config.default.php $RPM_BUILD_ROOT%{_sysconfdir}/config.inc.php
 ln -sf %{_sysconfdir}/config.inc.php $RPM_BUILD_ROOT%{_myadmindir}/config.inc.php
 
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/httpd/%{name}.conf
@@ -139,8 +140,8 @@ fi
 %defattr(644,root,root,755)
 %doc Documentation.* CREDITS ChangeLog INSTALL README TODO translators.html scripts
 %dir %{_sysconfdir}
-%attr(640,root,http) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/*
-%config(noreplace) %verify(not size mtime md5) /etc/httpd/%{name}.conf
+%attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*
+%config(noreplace) %verify(not md5 mtime size) /etc/httpd/%{name}.conf
 %dir %{_myadmindir}
 %{_myadmindir}/css
 %{_myadmindir}/themes