- ServerSelectDisplayName

Changed files:
    phpMyAdmin-ServerSelectDisplayName-config.patch -> 1.1
    phpMyAdmin-ServerSelectDisplayName.patch -> 1.1
    phpMyAdmin.spec -> 1.191

diff --git a/phpMyAdmin-ServerSelectDisplayName-config.patch b/phpMyAdmin-ServerSelectDisplayName-config.patch
new file mode 100644 (file)
index 0000000..983954a
--- /dev/null
+++ b/phpMyAdmin-ServerSelectDisplayName-config.patch
@@ -0,0 +1,18 @@
+*** libraries/config.default.php.orig  Tue Aug 19 00:56:44 2008
+--- libraries/config.default.php       Tue Aug 19 00:56:08 2008
+***************
+*** 80,85 ****
+--- 80,92 ----
+  $i = 1;
+  
+  /**
++  * Display name
++  *
++  * @global string $cfg['Servers'][$i]['display']
++  */
++ $cfg['Servers'][$i]['display'] = 'localhost';
++ 
++ /**
+   * MySQL hostname or IP address
+   *
+   * @global string $cfg['Servers'][$i]['host']

diff --git a/phpMyAdmin-ServerSelectDisplayName.patch b/phpMyAdmin-ServerSelectDisplayName.patch
new file mode 100644 (file)
index 0000000..cd27329
--- /dev/null
+++ b/phpMyAdmin-ServerSelectDisplayName.patch
@@ -0,0 +1,19 @@
+*** 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'];
+              }

diff --git a/phpMyAdmin.spec b/phpMyAdmin.spec
index 4c8e68ba152ee02d51150b3af1ffd5b7501c4dc9..ffcb6c31fd4b1a029624c331255c4435c3f66b8b 100644 (file)
--- a/phpMyAdmin.spec
+++ b/phpMyAdmin.spec
@@ -4,7 +4,7 @@ Summary:        phpMyAdmin - web-based MySQL administration
 Summary(pl.UTF-8):     phpMyAdmin - administracja bazami MySQL przez WWW
 Name:          phpMyAdmin
 Version:       2.11.8.1
-Release:       1
+Release:       2
 License:       GPL v2
 Group:         Applications/Databases/Interfaces
 Source0:       http://dl.sourceforge.net/phpmyadmin/%{name}-%{version}-all-languages.tar.bz2
@@ -12,6 +12,8 @@ Source0:      http://dl.sourceforge.net/phpmyadmin/%{name}-%{version}-all-languages.t
 Source1:       %{name}.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
 Requires(triggerpostun):       sed >= 4.0
@@ -73,6 +75,8 @@ podręcznika MySQL). Aktualnie phpMyAdmin potrafi:
 %prep
 %setup -q -n %{name}-%{version}-all-languages
 %patch0 -p1
+%patch1 -p0
+%patch2 -p0
 
 %install
 rm -rf $RPM_BUILD_ROOT