- up to 3.3.9.2

[packages/phpMyAdmin.git] / phpMyAdmin.spec

diff --git a/phpMyAdmin.spec b/phpMyAdmin.spec
index d224592dded951f4eaa5fd075346abbc8abfe523..082d2f1a6684928122f7aa4e78532c4154d86a3b 100644 (file)
--- a/phpMyAdmin.spec
+++ b/phpMyAdmin.spec
@@ -3,28 +3,34 @@
 Summary:       phpMyAdmin - web-based MySQL administration
 Summary(pl.UTF-8):     phpMyAdmin - administracja bazami MySQL przez WWW
 Name:          phpMyAdmin
-Version:       2.11.7
+Version:       3.3.9.2
 Release:       1
 License:       GPL v2
 Group:         Applications/Databases/Interfaces
-Source0:       http://dl.sourceforge.net/phpmyadmin/%{name}-%{version}-all-languages.tar.bz2
-# Source0-md5: 19ba7d07fcf3a6daefde1220e3c588f3
+Source0:       http://downloads.sourceforge.net/phpmyadmin/%{name}-%{version}-all-languages.tar.bz2
+# Source0-md5: db6b25e7b41d41b53d3bc03cd70c44ea
 Source1:       %{name}.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
-Requires:      php(ctype)
-Requires:      php(mbstring)
-Requires:      php(mcrypt)
-Requires:      php(mysql)
-Requires:      php(pcre)
+Requires:      php-common >= 4:5.2
+Requires:      php-ctype
+Requires:      php-mbstring
+Requires:      php-mcrypt
+Requires:      php-mysql
+Requires:      php-pcre
+Requires:      php-session
+Requires:      php-simplexml
 Requires:      webapps
 Requires:      webserver(access)
 Requires:      webserver(alias)
-Requires:      webserver(php)
+Suggests:      php-mysqli
 Suggests:      webserver(indexfile)
+Suggests:      webserver(php)
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -73,18 +79,21 @@ podręcznika MySQL). Aktualnie phpMyAdmin potrafi:
 %prep
 %setup -q -n %{name}-%{version}-all-languages
 %patch0 -p1
+%patch1 -p0
+%patch2 -p0
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_appdir}/{js,lang,libraries/{auth,dbg,dbi,engines,export,tcpdf/font,import,transformations}}}
+install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_appdir}/{js,lang,libraries/{auth/swekey,dbg,dbi,engines,export,tcpdf/font,import,transformations}}}
 
 install *.php *.html *.css $RPM_BUILD_ROOT%{_appdir}
 install lang/*.php $RPM_BUILD_ROOT%{_appdir}/lang
 cp -rf pmd $RPM_BUILD_ROOT%{_appdir}
 cp -rf themes $RPM_BUILD_ROOT%{_appdir}
-install js/* $RPM_BUILD_ROOT%{_appdir}/js
+cp -rf js $RPM_BUILD_ROOT%{_appdir}
 install libraries/*.php $RPM_BUILD_ROOT%{_appdir}/libraries
 install libraries/auth/*.php $RPM_BUILD_ROOT%{_appdir}/libraries/auth
+install libraries/auth/swekey/*.{php,crt} $RPM_BUILD_ROOT%{_appdir}/libraries/auth/swekey
 install libraries/dbg/*.php $RPM_BUILD_ROOT%{_appdir}/libraries/dbg
 install libraries/dbi/*.php $RPM_BUILD_ROOT%{_appdir}/libraries/dbi
 install libraries/engines/*.php $RPM_BUILD_ROOT%{_appdir}/libraries/engines
@@ -101,7 +110,6 @@ 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/tcpdf/README{,-tcpdf}
 cp -f libraries/import/README{,-import}
 cp -f libraries/transformations/README{,-transformations}
 
@@ -128,7 +136,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %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
+%doc Documentation.* CREDITS ChangeLog INSTALL README TODO translators.html scripts libraries/import/README-import libraries/transformations/README-transformations libraries/transformations/TEMPLATE* libraries/transformations/*.sh lang/*.sh
 %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