From d5cea24fdaa787a51e7d426bed8302ee5e526f7c5238ad8b0460ebfb8e1cd420 Mon Sep 17 00:00:00 2001
From: Eric Schirra <ecsos@schirra.net>
Date: Wed, 1 Jan 2014 15:38:50 +0000
Subject: [PATCH 1/2] Accepting request 212548 from home:ecsos

update to 4.1.3 and fix python-bytecode-inconsistent-mtime

OBS-URL: https://build.opensuse.org/request/show/212548
OBS-URL: https://build.opensuse.org/package/show/server:php:applications/phpMyAdmin?expand=0&rev=89
---
 phpMyAdmin-4.1.2-all-languages.tar.bz2 |  3 ---
 phpMyAdmin-4.1.3-all-languages.tar.bz2 |  3 +++
 phpMyAdmin.changes                     | 15 +++++++++++++++
 phpMyAdmin.spec                        | 11 +++++++++--
 4 files changed, 27 insertions(+), 5 deletions(-)
 delete mode 100644 phpMyAdmin-4.1.2-all-languages.tar.bz2
 create mode 100644 phpMyAdmin-4.1.3-all-languages.tar.bz2

diff --git a/phpMyAdmin-4.1.2-all-languages.tar.bz2 b/phpMyAdmin-4.1.2-all-languages.tar.bz2
deleted file mode 100644
index 8e7259f..0000000
--- a/phpMyAdmin-4.1.2-all-languages.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b1dd2a2a04bfc4c967f7c9d49e0d3ebaccd5da2ac793eb4031b4b1e50791e828
-size 6562933
diff --git a/phpMyAdmin-4.1.3-all-languages.tar.bz2 b/phpMyAdmin-4.1.3-all-languages.tar.bz2
new file mode 100644
index 0000000..04a4a9f
--- /dev/null
+++ b/phpMyAdmin-4.1.3-all-languages.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1ef9b937bf8a97da6c6d760862f6c0ec19e8ec35642f27677c316c5969b79b92
+size 6343459
diff --git a/phpMyAdmin.changes b/phpMyAdmin.changes
index e216680..1dc7750 100644
--- a/phpMyAdmin.changes
+++ b/phpMyAdmin.changes
@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Wed Jan  1 12:59:03 UTC 2014 - ecsos@schirra.net
+
+- update to 4.1.3 (2013-12-31)
+  - sf#3938 PDFDefaultPageSize doc and easy configurability
+  - sf#4198 Hovering over pie chart gives fatal JS error
+  - sf#4200 Missing syntax highlighting
+  - sf#4201 Exports are not compressed
+  - sf#4131 Import: "number of rows to skip" is ambiguous
+  - sf#4205 Add a user shows additional "edit user group" link
+  - sf#4202 Cannot read property 'token' of undefined
+  - sf#4203 On refreshing designer, $.FullScreen is undefined
+  - sf#3920 Lost space in navigation area
+- Fix python-bytecode-inconsistent-mtime
+
 -------------------------------------------------------------------
 Mon Dec 23 23:47:24 UTC 2013 - ecsos@schirra.net
 
diff --git a/phpMyAdmin.spec b/phpMyAdmin.spec
index d038cee..f48df85 100644
--- a/phpMyAdmin.spec
+++ b/phpMyAdmin.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package phpMyAdmin
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -34,7 +34,7 @@ Name:           phpMyAdmin
 Summary:        Administration of MySQL over the web
 License:        GPL-2.0+
 Group:          Productivity/Networking/Web/Frontends
-Version:        4.1.2
+Version:        4.1.3
 Release:        0
 Url:            http://www.phpMyAdmin.net
 Source0:        %{name}-%{version}-all-languages.tar.bz2
@@ -44,6 +44,7 @@ BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 PreReq:         pwgen coreutils sed grep
 BuildRequires:  apache2-devel
+BuildRequires:  python-devel
 %if 0%{?suse_version} > 1020
 BuildRequires:  fdupes
 %endif
@@ -137,6 +138,12 @@ find $RPM_BUILD_ROOT%{ap_docroot}/%{name} -maxdepth 1 -type f | grep -v 'config.
 %fdupes ${RPM_BUILD_ROOT}%{ap_docroot}/%{name}/themes
 %endif
 
+# Fix python-bytecode-inconsistent-mtime
+rm -rf doc/_ext/configext.pyc
+pushd doc/_ext
+%py_compile ./
+popd
+
 %post
 # on `rpm -ivh` PARAM is 1
 # on `rpm -Uvh` PARAM is 2

From 545a9d0522bc1cbd1ea2f8512661a0d8d42b3b6d63b95ff4320552132bdf0b1e Mon Sep 17 00:00:00 2001
From: Eric Schirra <ecsos@schirra.net>
Date: Wed, 1 Jan 2014 17:18:20 +0000
Subject: [PATCH 2/2] Accepting request 212561 from
 home:AndreasStieger:branches:server:php:applications

- add source URL, see https://en.opensuse.org/SourceUrls

OBS-URL: https://build.opensuse.org/request/show/212561
OBS-URL: https://build.opensuse.org/package/show/server:php:applications/phpMyAdmin?expand=0&rev=90
---
 phpMyAdmin.changes | 5 +++++
 phpMyAdmin.spec    | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/phpMyAdmin.changes b/phpMyAdmin.changes
index 1dc7750..31005f0 100644
--- a/phpMyAdmin.changes
+++ b/phpMyAdmin.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Jan  1 16:36:22 UTC 2014 - andreas.stieger@gmx.de
+
+- add source URL, see https://en.opensuse.org/SourceUrls
+
 -------------------------------------------------------------------
 Wed Jan  1 12:59:03 UTC 2014 - ecsos@schirra.net
 
diff --git a/phpMyAdmin.spec b/phpMyAdmin.spec
index f48df85..638f990 100644
--- a/phpMyAdmin.spec
+++ b/phpMyAdmin.spec
@@ -37,7 +37,7 @@ Group:          Productivity/Networking/Web/Frontends
 Version:        4.1.3
 Release:        0
 Url:            http://www.phpMyAdmin.net
-Source0:        %{name}-%{version}-all-languages.tar.bz2
+Source0:        http://sourceforge.net/projects/phpmyadmin/files/%{name}-%{version}-all-languages.tar.bz2
 Source1:        %{name}.http
 Patch0:         %{name}-config.patch
 BuildArch:      noarch