apache 2.2/2.4 compatible config

[packages/phpMyAdmin.git] / phpMyAdmin.spec

diff --git a/phpMyAdmin.spec b/phpMyAdmin.spec
index 4efce8106049c1b74b3e3680b7d84b46ee218543..012cb6c2e18a3f5f556a24c987ef0b61f590809a 100644 (file)
--- a/phpMyAdmin.spec
+++ b/phpMyAdmin.spec
@@ -4,20 +4,24 @@
 Summary:       phpMyAdmin - web-based MySQL administration
 Summary(pl.UTF-8):     phpMyAdmin - administracja bazami MySQL przez WWW
 Name:          phpMyAdmin
-Version:       3.5.2.1
-Release:       1
+Version:       4.1.6
+Release:       2
 License:       GPL v2
 Group:         Applications/Databases/Interfaces
-Source0:       http://downloads.sourceforge.net/phpmyadmin/%{name}-%{version}-all-languages.tar.bz2
-# Source0-md5: b6eddc5702788de38089c7eaba4b96f4
-Source1:       %{name}.conf
+Source0:       http://downloads.sourceforge.net/phpmyadmin/%{name}-%{version}-all-languages.tar.xz
+# Source0-md5: 2f34f35824f7189822ca2a9f1ccc55ce
+Source1:       apache.conf
 Source2:       %{name}-lighttpd.conf
 Patch0:                %{name}-config.patch
 Patch1:                %{name}-ServerSelectDisplayName.patch
 Patch2:                %{name}-ServerSelectDisplayName-config.patch
 URL:           http://www.phpmyadmin.net/
 BuildRequires: rpmbuild(macros) >= 1.268
-Requires(triggerpostun):       sed >= 4.0
+BuildRequires: tar >= 1:1.22
+BuildRequires: xz
+# phpMyAdmin doesn't support mysql < 5.5 and won't work with php < 5.3
+Requires:      mysql-libs >= 5.5
+Requires:      php(core) >= 5.3
 Requires:      php(ctype)
 Requires:      php(filter)
 Requires:      php(json)
@@ -27,10 +31,10 @@ Requires:   php(mysql)
 Requires:      php(pcre)
 Requires:      php(session)
 Requires:      php(simplexml)
-Requires:      php-common >= 4:5.2
 Requires:      webapps
 Requires:      webserver(access)
 Requires:      webserver(alias)
+Requires(triggerpostun):       sed >= 4.0
 Suggests:      php-mysqli
 Suggests:      webserver(indexfile)
 Suggests:      webserver(php)
@@ -89,18 +93,15 @@ podręcznika MySQL). Aktualnie phpMyAdmin potrafi:
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_appdir}}
 
-install *.php *.html *.css robots.txt $RPM_BUILD_ROOT%{_appdir}
+cp -p *.php *.css favicon.ico robots.txt $RPM_BUILD_ROOT%{_appdir}
 cp -a locale themes js libraries $RPM_BUILD_ROOT%{_appdir}
 
-install libraries/config.default.php $RPM_BUILD_ROOT%{_sysconfdir}/config.inc.php
+cp -p libraries/config.default.php $RPM_BUILD_ROOT%{_sysconfdir}/config.inc.php
 ln -sf %{_sysconfdir}/config.inc.php $RPM_BUILD_ROOT%{_appdir}/config.inc.php
 
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
-install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/lighttpd.conf
-
-cp -f libraries/import/README{,-import}
-cp -f libraries/transformations/README{,-transformations}
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
+cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/lighttpd.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -125,7 +126,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc Documentation.* ChangeLog README README.VENDOR libraries/import/README-import libraries/transformations/README-transformations libraries/transformations/TEMPLATE* libraries/transformations/*.sh
+%doc ChangeLog README examples
 %dir %attr(750,root,http) %{_sysconfdir}
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/apache.conf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf
@@ -137,6 +138,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_appdir}/locale
 %{_appdir}/themes
 %{_appdir}/*.css
-%{_appdir}/*.html
 %{_appdir}/*.php
+%{_appdir}/favicon.ico
 %{_appdir}/robots.txt