X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=phpMyAdmin.spec;h=358de1d3d02867d8e5f6c253311028093b43b850;hb=6a408702edbf807badbb29c2c4c2b286fcdc0a55;hp=fd15cf8d9531d584d649895435f2522a2c5d01aa;hpb=9854e6226442bf919c2a9b2512a0185ded150dbf;p=packages%2FphpMyAdmin.git

diff --git a/phpMyAdmin.spec b/phpMyAdmin.spec
index fd15cf8..358de1d 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.1.14
-Release:	1
+Version:	4.2.2
+Release:	0.1
 License:	GPL v2
 Group:		Applications/Databases/Interfaces
 Source0:	http://downloads.sourceforge.net/phpmyadmin/%{name}-%{version}-all-languages.tar.xz
-# Source0-md5:	8a63d66f64a46cf1ec92fdd0b5e42fc2
-Source1:	apache.conf
+# Source0-md5:	67f15fb02d327f04fca3713d57ccc367
+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