X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=phpMyAdmin.spec;h=d304ec1f4fb0924c4f762c5ad8a4749eada60ebb;hb=9717d2d37277023c2ac54ef1ca14cb44349f641c;hp=4a8a79f128cc285277f37a6f8aee827825d1ebfb;hpb=77cf866ba1e0a8f687a468bd1bf44eca08bf1478;p=packages%2FphpMyAdmin.git

diff --git a/phpMyAdmin.spec b/phpMyAdmin.spec
index 4a8a79f..d304ec1 100644
--- a/phpMyAdmin.spec
+++ b/phpMyAdmin.spec
@@ -3,19 +3,19 @@
 Summary:	phpMyAdmin - web-based MySQL administration
 Summary(pl.UTF-8):	phpMyAdmin - administracja bazami MySQL przez WWW
 Name:		phpMyAdmin
-Version:	3.0.0
+Version:	3.3.9
 Release:	1
 License:	GPL v2
 Group:		Applications/Databases/Interfaces
-Source0:	http://dl.sourceforge.net/phpmyadmin/%{name}-%{version}-all-languages.tar.bz2
-# Source0-md5:	f14b23fa5065fdc1e1709c87bb2aad1d
+Source0:	http://downloads.sourceforge.net/phpmyadmin/%{name}-%{version}-all-languages.tar.bz2
+# Source0-md5:	8378a7c0fa76dbe46805660bcf0e1ebe
 Source1:	%{name}.conf
 Source2:	%{name}-lighttpd.conf
 Patch0:		%{name}-config.patch
-URL:		http://www.phpmyadmin.net/
-BuildRequires:	rpmbuild(macros) >= 1.268
 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-common >= 4:5.2
 Requires:	php-ctype
@@ -23,12 +23,14 @@ 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)
 
@@ -82,7 +84,7 @@ podręcznika MySQL). Aktualnie phpMyAdmin potrafi:
 
 %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
@@ -91,6 +93,7 @@ cp -rf themes $RPM_BUILD_ROOT%{_appdir}
 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