up to 4.8.2

diff --git a/phpMyAdmin-ServerSelectDisplayName.patch b/phpMyAdmin-ServerSelectDisplayName.patch
index cd273295083c6d98037c422643b651e798fb363d..07103171a0c2cbbcec21876b09fa5d3c6c85fa2f 100644 (file)
--- a/phpMyAdmin-ServerSelectDisplayName.patch
+++ b/phpMyAdmin-ServerSelectDisplayName.patch
@@ -1,19 +1,11 @@
-*** libraries/select_server.lib.php.org        Tue Aug 19 00:41:59 2008
---- libraries/select_server.lib.php    Tue Aug 19 00:42:35 2008
-***************
-*** 62,68 ****
-          if (!empty($server['verbose'])) {
-              $label = $server['verbose'];
-          } else {
-!             $label = $server['host'];
-              if (!empty($server['port'])) {
-                  $label .= ':' . $server['port'];
-              }
---- 62,68 ----
-          if (!empty($server['verbose'])) {
-              $label = $server['verbose'];
-          } else {
-!             $label = isset($server['display']) ? $server['display'] : $server['host'];
-              if (!empty($server['port'])) {
-                  $label .= ':' . $server['port'];
-              }
+--- phpMyAdmin-4.8.2-all-languages/libraries/classes/Server/Select.php~        2018-06-21 20:08:17.000000000 +0300
++++ phpMyAdmin-4.8.2-all-languages/libraries/classes/Server/Select.php 2018-08-13 12:00:56.105426801 +0300
+@@ -72,7 +72,7 @@
+             if (!empty($server['verbose'])) {
+                 $label = $server['verbose'];
+             } else {
+-                $label = $server['host'];
++                $label = isset($server['display']) ? $server['display'] : $server['host'];
+                 if (!empty($server['port'])) {
+                     $label .= ':' . $server['port'];
+                 }

diff --git a/phpMyAdmin.spec b/phpMyAdmin.spec
index feafc9f5276da9642b066ed64e2e39ddf4d8077d..78802e054f13daf4cbac32e91961ed645c6811f0 100644 (file)
--- a/phpMyAdmin.spec
+++ b/phpMyAdmin.spec
@@ -4,12 +4,12 @@
 Summary:       phpMyAdmin - web-based MySQL administration
 Summary(pl.UTF-8):     phpMyAdmin - administracja bazami MySQL przez WWW
 Name:          phpMyAdmin
-Version:       4.4.15.10
-Release:       1
+Version:       4.8.2
+Release:       0.1
 License:       GPL v2
 Group:         Applications/Databases/Interfaces
 Source0:       https://files.phpmyadmin.net/phpMyAdmin/%{version}/%{name}-%{version}-all-languages.tar.xz
-# Source0-md5: 984adeb9153144580887695ba392576b
+# Source0-md5: 047b340a038b89e9e34f426084101f03
 Source1:       apache.conf
 Source2:       %{name}-lighttpd.conf
 Patch0:                %{name}-config.patch
@@ -86,14 +86,13 @@ podręcznika MySQL). Aktualnie phpMyAdmin potrafi:
 %prep
 %setup -q -n %{name}-%{version}-all-languages
 %patch0 -p1
-%patch1 -p0
+%patch1 -p1
 %patch2 -p0
 
 # cleanup backups after patching
 find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
 
-# github stuff
-%{__rm} composer.json phpunit.xml*
+%{__rm} .editorconfig .eslintignore .eslintrc.json composer.json composer.lock package.json phpcs.xml.dist yarn.lock
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -109,7 +108,7 @@ cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
 cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/lighttpd.conf
 
 # packaged as doc
-%{__rm} $RPM_BUILD_ROOT%{_appdir}/{CONTRIBUTING.md,ChangeLog,DCO,LICENSE,README,RELEASE-DATE-*}
+%{__rm} $RPM_BUILD_ROOT%{_appdir}/{CONTRIBUTING.md,ChangeLog,DCO,LICENSE,README,RELEASE-DATE-*,CODE_OF_CONDUCT.md}
 # cleanup not packaged stuff
 %{__rm} -r $RPM_BUILD_ROOT%{_appdir}/{doc,examples,setup,sql}
 
@@ -143,11 +142,13 @@ rm -rf $RPM_BUILD_ROOT
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/lighttpd.conf
 %attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*.php
 %dir %{_appdir}
-%{_appdir}/js
-%{_appdir}/libraries
-%{_appdir}/locale
-%{_appdir}/themes
 %{_appdir}/*.css
 %{_appdir}/*.php
 %{_appdir}/favicon.ico
+%{_appdir}/js
+%{_appdir}/libraries
+%{_appdir}/locale
 %{_appdir}/robots.txt
+%{_appdir}/themes
+%{_appdir}/templates
+%{_appdir}/vendor