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

diff --git a/phpMyAdmin.spec b/phpMyAdmin.spec
index 3dbb65c..d0f3668 100644
--- a/phpMyAdmin.spec
+++ b/phpMyAdmin.spec
@@ -4,16 +4,15 @@
 Summary:	phpMyAdmin - web-based MySQL administration
 Summary(pl.UTF-8):	phpMyAdmin - administracja bazami MySQL przez WWW
 Name:		phpMyAdmin
-Version:	4.5.3.1
+Version:	4.8.0
 Release:	1
 License:	GPL v2
 Group:		Applications/Databases/Interfaces
 Source0:	https://files.phpmyadmin.net/%{name}/%{version}/%{name}-%{version}-all-languages.tar.xz
-# Source0-md5:	e7e9981c75d356f5fb932e1a2e4978f8
+# Source0-md5:	946334c6732fe7c5e3d80786794249d1
 Source1:	%{name}-apache.conf
 Source2:	%{name}-lighttpd.conf
 Patch0:		%{name}-config.patch
-Patch1:		%{name}-ServerSelectDisplayName.patch
 URL:		http://www.phpmyadmin.net/
 BuildRequires:	rpmbuild(macros) >= 1.268
 BuildRequires:	tar >= 1:1.22
@@ -25,7 +24,7 @@ Requires:	php(ctype)
 Requires:	php(filter)
 Requires:	php(json)
 Requires:	php(mbstring)
-Requires:	php(mcrypt)
+#Requires:	php(mcrypt)
 Requires:	php(mysqli)
 Requires:	php(pcre)
 Requires:	php(session)
@@ -84,7 +83,6 @@ podręcznika MySQL). Aktualnie phpMyAdmin potrafi:
 %prep
 %setup -q -n %{name}-%{version}-all-languages
 %patch0 -p1
-%patch1 -p0
 
 # cleanup backups after patching
 find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
@@ -94,7 +92,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 js libraries locale templates themes $RPM_BUILD_ROOT%{_appdir}
+cp -a js libraries locale templates themes vendor $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