X-Git-Url: https://git.tld-linux.org/?p=packages%2FphpMyAdmin.git;a=blobdiff_plain;f=phpMyAdmin.spec;h=d4e0c4bd62848bf0383d8bf7374047ab52b3ce65;hp=bc2f731f9caa9c3d8f2c6297d4429f0c3422bec1;hb=HEAD;hpb=58f71afbd2fca01fcee8244a1210e072b302f128

diff --git a/phpMyAdmin.spec b/phpMyAdmin.spec
index bc2f731..d9b9626 100644
--- a/phpMyAdmin.spec
+++ b/phpMyAdmin.spec
@@ -2,17 +2,16 @@
 Summary:	phpMyAdmin - web-based MySQL administration
 Summary(pl.UTF-8):	phpMyAdmin - administracja bazami MySQL przez WWW
 Name:		phpMyAdmin
-Version:	5.0.2
-Release:	2
+Version:	5.1.1
+Release:	1
 License:	GPL v2
 Group:		Applications/Databases/Interfaces
 Source0:	https://files.phpmyadmin.net/%{name}/%{version}/%{name}-%{version}-all-languages.tar.xz
-# Source0-md5:	442eb85912d3a2ad2fc0b9d6c21b1527
+# Source0-md5:	e73377b11b7d38fa3f3014f2799c5252
 Source1:	%{name}-apache.conf
 Source2:	%{name}-lighttpd.conf
 Patch0:		%{name}-config.patch
 Patch1:		%{name}-disable-version-check.patch
-Patch2:		%{name}-env.patch
 URL:		http://www.phpmyadmin.net/
 BuildRequires:	rpmbuild(macros) >= 1.268
 BuildRequires:	tar >= 1:1.22
@@ -84,7 +83,6 @@ podręcznika MySQL). Aktualnie phpMyAdmin potrafi:
 %setup -q -n %{name}-%{version}-all-languages
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 # cleanup backups after patching
 find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
@@ -93,7 +91,7 @@ find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_appdir}/tmp}
 
-cp -p *.php *.css favicon.ico robots.txt $RPM_BUILD_ROOT%{_appdir}
+cp -p *.php *.css *.json *.lock favicon.ico robots.txt $RPM_BUILD_ROOT%{_appdir}
 cp -a js libraries locale sql templates themes vendor $RPM_BUILD_ROOT%{_appdir}
 
 cp -p libraries/config.default.php $RPM_BUILD_ROOT%{_sysconfdir}/config.inc.php
@@ -143,5 +141,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_appdir}/vendor
 %{_appdir}/*.css
 %{_appdir}/*.php
+%{_appdir}/*.json
+%{_appdir}/*.lock
 %{_appdir}/favicon.ico
 %{_appdir}/robots.txt