X-Git-Url: https://git.tld-linux.org/?p=packages%2FphpMyAdmin.git;a=blobdiff_plain;f=phpMyAdmin.spec;h=3dbb65cb0243f84a60b60d25b96fd72d518c032b;hp=9807dd47bc8ed3bce5e11941b186883c314ead14;hb=cecc4de2aff12ca52c68e71882962c0878e6e3f3;hpb=e9212e062e1ae28d0ef2b24d78bc0a1a1e08c944

diff --git a/phpMyAdmin.spec b/phpMyAdmin.spec
index 9807dd4..3dbb65c 100644
--- a/phpMyAdmin.spec
+++ b/phpMyAdmin.spec
@@ -4,17 +4,16 @@
 Summary:	phpMyAdmin - web-based MySQL administration
 Summary(pl.UTF-8):	phpMyAdmin - administracja bazami MySQL przez WWW
 Name:		phpMyAdmin
-Version:	4.2.2
-Release:	0.1
+Version:	4.5.3.1
+Release:	1
 License:	GPL v2
 Group:		Applications/Databases/Interfaces
-Source0:	http://downloads.sourceforge.net/phpmyadmin/%{name}-%{version}-all-languages.tar.xz
-# Source0-md5:	67f15fb02d327f04fca3713d57ccc367
-Source1:	apache.conf
+Source0:	https://files.phpmyadmin.net/%{name}/%{version}/%{name}-%{version}-all-languages.tar.xz
+# Source0-md5:	e7e9981c75d356f5fb932e1a2e4978f8
+Source1:	%{name}-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
 BuildRequires:	tar >= 1:1.22
@@ -27,7 +26,7 @@ Requires:	php(filter)
 Requires:	php(json)
 Requires:	php(mbstring)
 Requires:	php(mcrypt)
-Requires:	php(mysql)
+Requires:	php(mysqli)
 Requires:	php(pcre)
 Requires:	php(session)
 Requires:	php(simplexml)
@@ -35,7 +34,6 @@ Requires:	webapps
 Requires:	webserver(access)
 Requires:	webserver(alias)
 Requires(triggerpostun):	sed >= 4.0
-Suggests:	php-mysqli
 Suggests:	webserver(indexfile)
 Suggests:	webserver(php)
 BuildArch:	noarch
@@ -87,7 +85,6 @@ podręcznika MySQL). Aktualnie phpMyAdmin potrafi:
 %setup -q -n %{name}-%{version}-all-languages
 %patch0 -p1
 %patch1 -p0
-%patch2 -p0
 
 # cleanup backups after patching
 find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
@@ -97,7 +94,7 @@ rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_appdir}}
 
 cp -p *.php *.css favicon.ico robots.txt $RPM_BUILD_ROOT%{_appdir}
-cp -a locale themes js libraries $RPM_BUILD_ROOT%{_appdir}
+cp -a js libraries locale templates themes $RPM_BUILD_ROOT%{_appdir}
 
 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
@@ -139,6 +136,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_appdir}/js
 %{_appdir}/libraries
 %{_appdir}/locale
+%{_appdir}/templates
 %{_appdir}/themes
 %{_appdir}/*.css
 %{_appdir}/*.php