- updated to 2.11.0

Changed files:
    phpMyAdmin-config.patch -> 1.16
    phpMyAdmin.spec -> 1.164

diff --git a/phpMyAdmin-config.patch b/phpMyAdmin-config.patch
index cbf77494a8a968943e812b05826495fcba5272cb..ca57f72195ec55de4c094a38a155687a8071f9a5 100644 (file)
--- a/phpMyAdmin-config.patch
+++ b/phpMyAdmin-config.patch
@@ -1,22 +1,19 @@
---- libraries/config.default.php.orig  2007-02-28 01:51:14.000000000 +0100
-+++ libraries/config.default.php       2007-02-28 05:46:58.000000000 +0100
-@@ -1,7 +1,7 @@
- <?php
- /* !!! DO NOT EDIT THIS FILE, EDIT config.inc.php INSTEAD !!! */
+--- phpMyAdmin-2.11.0-all-languages.orig/libraries/config.default.php  2007-08-22 20:04:58.000000000 +0200
++++ phpMyAdmin-2.11.0-all-languages/libraries/config.default.php       2007-08-22 20:05:57.000000000 +0200
+@@ -141,14 +141,14 @@
+  *
+  * @global string $cfg['Servers'][$i]['auth_type']
+  */
+-$cfg['Servers'][$i]['auth_type'] = 'config';
++$cfg['Servers'][$i]['auth_type'] = 'cookie';
  
--/* $Id$ */
-+/* $Id$ */
- // vim: expandtab sw=4 ts=4 sts=4:
+ /**
+  * MySQL user
+  *
+  * @global string $cfg['Servers'][$i]['user']
+  */
+-$cfg['Servers'][$i]['user'] = 'root';
++$cfg['Servers'][$i]['user'] = 'mysql';
  
  /**
-@@ -68,8 +68,8 @@
-                                                     // The controluser is also
-                                                     // used for all relational
-                                                     // features (pmadb)
--$cfg['Servers'][$i]['auth_type']     = 'config';    // Authentication method (valid choices: config, http, HTTP, signon or cookie)
--$cfg['Servers'][$i]['user']          = 'root';      // MySQL user
-+$cfg['Servers'][$i]['auth_type']     = 'cookie';    // Authentication method (valid choices: config, http, HTTP, signon or cookie)
-+$cfg['Servers'][$i]['user']          = 'mysql';      // MySQL user
- $cfg['Servers'][$i]['password']      = '';          // MySQL password (only needed
-                                                     // with 'config' auth_type)
- $cfg['Servers'][$i]['SignonSession'] = '';          // Session to use for 'signon' auth method
+  * MySQL password (only needed with 'config' auth_type)

diff --git a/phpMyAdmin.spec b/phpMyAdmin.spec
index c733cb8ea8ab9d50c2d4ff034f2504bc5ae7428a..5b22af878638fd241a62d531972c7680ade1ac72 100644 (file)
--- a/phpMyAdmin.spec
+++ b/phpMyAdmin.spec
@@ -1,18 +1,19 @@
 Summary:       phpMyAdmin - web-based MySQL administration
 Summary(pl.UTF-8):     phpMyAdmin - administracja bazami MySQL przez WWW
 Name:          phpMyAdmin
-Version:       2.10.3
+Version:       2.11.0
 Release:       1
 License:       GPL v2
 Group:         Applications/Databases/Interfaces
 Source0:       http://dl.sourceforge.net/phpmyadmin/%{name}-%{version}-all-languages.tar.bz2
-# Source0-md5: 7866cc1033ba79b5f71354c66d109033
+# Source0-md5: 64cf56f3b44725e5edcdea871166641f
 Source1:       %{name}.conf
 Patch0:                %{name}-config.patch
 URL:           http://www.phpmyadmin.net/
 BuildRequires: rpmbuild(macros) >= 1.268
 Requires(triggerpostun):       sed >= 4.0
 Requires:      php(ctype)
+Requires:      php(mcrypt)
 Requires:      php(mbstring)
 Requires:      php(mysql)
 Requires:      php(pcre)
@@ -66,17 +67,16 @@ podręcznika MySQL). Aktualnie phpMyAdmin potrafi:
 
 %prep
 %setup -q -n %{name}-%{version}-all-languages
-%patch0 -p0
+%patch0 -p1
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_appdir}/{css,js,lang,libraries/{auth,dbg,dbi,engines,export,tcpdf/font,import,transformations}}}
+install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_appdir}/{js,lang,libraries/{auth,dbg,dbi,engines,export,tcpdf/font,import,transformations}}}
 
 install *.php *.html *.css $RPM_BUILD_ROOT%{_appdir}
 install lang/*.php $RPM_BUILD_ROOT%{_appdir}/lang
 cp -rf pmd $RPM_BUILD_ROOT%{_appdir}
 cp -rf themes $RPM_BUILD_ROOT%{_appdir}
-install css/* $RPM_BUILD_ROOT%{_appdir}/css
 install js/* $RPM_BUILD_ROOT%{_appdir}/js
 install libraries/*.php $RPM_BUILD_ROOT%{_appdir}/libraries
 install libraries/auth/*.php $RPM_BUILD_ROOT%{_appdir}/libraries/auth
@@ -160,7 +160,6 @@ rm -f /etc/httpd/httpd.conf/99_%{name}.conf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf
 %attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*.php
 %dir %{_appdir}
-%{_appdir}/css
 %{_appdir}/js
 %{_appdir}/lang
 %{_appdir}/libraries