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

diff --git a/phpMyAdmin.spec b/phpMyAdmin.spec
index 9807dd4..912051b 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.2.3
+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-md5:	d6dbcdd5bbe15f84d8b616ec201e020a
+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
@@ -87,7 +86,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