From: djurban <djurban@pld-linux.org>
Date: Tue, 7 Sep 2004 16:09:10 +0000 (+0000)
Subject: - updated to 2.6.0-rc please note two things (please comment):
X-Git-Tag: auto/ac/phpMyAdmin-2_6_0-0_rc2_3~1
X-Git-Url: http://git.pld-linux.org/?a=commitdiff_plain;ds=sidebyside;h=7b026d6716a0c7964f9041cbed202d69db04e5a6;p=packages%2FphpMyAdmin.git

- updated to 2.6.0-rc please note two things (please comment):
1.) blowfish phrase is now required for cookie auth, pelase set it independently
  in /etc/phpMyAdmin/config.inc.php (not sure if the package should contan a default phrase
  the good thing about that is: works out of the box, bad: insecure
2.) PMAbsoluteUri should be set as well (at least here the autodetection mechanism failed),
  it is default in PLD for http://<yourwebdomain>/myadmin
  again not sure if this should be added in the config file by packager or not

Changed files:
    phpMyAdmin.spec -> 1.73
---

diff --git a/phpMyAdmin.spec b/phpMyAdmin.spec
index c471187..b3eb68d 100644
--- a/phpMyAdmin.spec
+++ b/phpMyAdmin.spec
@@ -1,15 +1,15 @@
 Summary:	phpMyAdmin - web-based MySQL administration
 Summary(pl):	phpMyAdmin - administracja bazami MySQL przez WWW
 Name:		phpMyAdmin
-%define		_pl	pl1
-%define		_rel	3	
+%define		_pl	rc2
+%define		_rel	2
 # NOTE: bump _rel with every new patchlevel
-Version:	2.5.7
-Release:	%{_rel}.%{_pl}
+Version:	2.6.0
+Release:	0.%{_pl}.%{_rel}
 License:	GPL v2
 Group:		Applications/Databases/Interfaces
 Source0:	http://dl.sourceforge.net/phpmyadmin/%{name}-%{version}-%{_pl}.tar.bz2
-# Source0-md5:	93b7c7f3dfcfd6df9c2ea26f31a51772
+# Source0-md5:	134fcb19e76a4bbab121d4aeefd2422b
 Source1:	%{name}.conf
 Patch0:		%{name}-config.patch
 URL:		http://www.phpmyadmin.net/
@@ -65,16 +65,22 @@ MySQL). Aktualnie phpMyAdmin potrafi:
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_myadmindir}/{css,lang,images,libraries/{auth,export}} \
+install -d $RPM_BUILD_ROOT%{_myadmindir}/{css,lang,libraries/{auth,export,dbg,dbi,transformations}} \
 	$RPM_BUILD_ROOT{%{_sysconfdir},/etc/httpd}
 
 install *.php *.html *.css $RPM_BUILD_ROOT%{_myadmindir}
-install images/*.{gif,png} $RPM_BUILD_ROOT%{_myadmindir}/images
+#install images/*.{gif,png} $RPM_BUILD_ROOT%{_myadmindir}/images
 install lang/*.php $RPM_BUILD_ROOT%{_myadmindir}/lang
+cp -rf themes  $RPM_BUILD_ROOT%{_myadmindir}/
 install css/* $RPM_BUILD_ROOT%{_myadmindir}/css
 install libraries/*.{js,php} $RPM_BUILD_ROOT%{_myadmindir}/libraries
 install libraries/auth/*.php $RPM_BUILD_ROOT%{_myadmindir}/libraries/auth
 install libraries/export/*.php $RPM_BUILD_ROOT%{_myadmindir}/libraries/export
+install libraries/dbg/*.php $RPM_BUILD_ROOT%{_myadmindir}/libraries/dbg
+install libraries/dbi/*.php $RPM_BUILD_ROOT%{_myadmindir}/libraries/dbi
+install libraries/transformations/*.php $RPM_BUILD_ROOT%{_myadmindir}/libraries/transformations
+
+cp -rf scripts $RPM_BUILD_ROOT%{_myadmindir}
 
 install config.inc.php $RPM_BUILD_ROOT%{_sysconfdir}
 ln -sf %{_sysconfdir}/config.inc.php $RPM_BUILD_ROOT%{_myadmindir}/config.inc.php
@@ -135,7 +141,8 @@ fi
 %config(noreplace) %verify(not size mtime md5) /etc/httpd/%{name}.conf
 %dir %{_myadmindir}
 %{_myadmindir}/css
-%{_myadmindir}/images
+%{_myadmindir}/themes
+%{_myadmindir}/scripts
 %{_myadmindir}/lang
 %{_myadmindir}/libraries
 %{_myadmindir}/*.css