packages: phpPgAdmin/phpPgAdmin-calendar.patch, phpPgAdmin/phpPgAdmin-confi...

[gotar]

Author: gotar                        Date: Wed Sep 29 23:08:48 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- upgraded to 5.0-beta1

---- Files affected:
packages/phpPgAdmin:
   phpPgAdmin-calendar.patch (1.1 -> 1.2) , phpPgAdmin-config.patch (1.4 -> 1.5) , phpPgAdmin.spec (1.78 -> 1.79) 

---- Diffs:

================================================================
Index: packages/phpPgAdmin/phpPgAdmin-calendar.patch
diff -u packages/phpPgAdmin/phpPgAdmin-calendar.patch:1.1 packages/phpPgAdmin/phpPgAdmin-calendar.patch:1.2
--- packages/phpPgAdmin/phpPgAdmin-calendar.patch:1.1	Wed Apr 15 13:58:29 2009
+++ packages/phpPgAdmin/phpPgAdmin-calendar.patch	Thu Sep 30 01:08:42 2010
@@ -1,7 +1,7 @@
 diff -ur phpPgAdmin-4.2.2.orig/classes/database/Postgres.php phpPgAdmin-4.2.2/classes/database/Postgres.php
 --- phpPgAdmin-4.2.2.orig/classes/database/Postgres.php	2008-12-18 06:28:57.000000000 +0100
-+++ phpPgAdmin-4.2.2/classes/database/Postgres.php	2009-01-12 23:28:00.000000000 +0100
-@@ -320,6 +320,14 @@
++++ phpPgAdmin-4.2.2/classes/database/Postgres.php	2010-09-30 01:01:41.000000000 +0200
+@@ -303,6 +303,14 @@ class Postgres extends ADODB_base {
  				echo htmlspecialchars($value);
  				echo "</textarea>\n";
  				break;
@@ -14,7 +14,7 @@
 +				echo "<script type=\"text/javascript\">Calendar.setup( { inputField: \"", htmlspecialchars($name), "\", button: \"trigger", htmlspecialchars($name), "\", showsTime: $showsTime, ifFormat: \"%Y-%m-%d$timeFormat\" }); </script>";
 +				break;
  			default:
- 				echo "<input name=\"", htmlspecialchars($name), "\" value=\"", htmlspecialchars($value), "\" size=\"35\"{$action_str} {$szExtra} />\n";
+ 				echo "<input name=\"", htmlspecialchars($name), "\" value=\"", htmlspecialchars($value), "\" size=\"35\"{$action_str} {$extra} />\n";
  				break;
 diff -ur phpPgAdmin-4.2.2.orig/classes/Misc.php phpPgAdmin-4.2.2/classes/Misc.php
 --- phpPgAdmin-4.2.2.orig/classes/Misc.php	2008-12-18 06:28:57.000000000 +0100

================================================================
Index: packages/phpPgAdmin/phpPgAdmin-config.patch
diff -u packages/phpPgAdmin/phpPgAdmin-config.patch:1.4 packages/phpPgAdmin/phpPgAdmin-config.patch:1.5
--- packages/phpPgAdmin/phpPgAdmin-config.patch:1.4	Wed Aug 29 14:18:19 2007
+++ packages/phpPgAdmin/phpPgAdmin-config.patch	Thu Sep 30 01:08:42 2010
@@ -35,7 +35,7 @@
  	// Set error reporting level to max
 -	error_reporting(E_ALL);
 +	error_reporting(E_ALL & ~E_NOTICE);
+ 	ini_set('display_errors', 'on');
  
  	// Application name 
- 	$appName = 'phpPgAdmin';
 

================================================================
Index: packages/phpPgAdmin/phpPgAdmin.spec
diff -u packages/phpPgAdmin/phpPgAdmin.spec:1.78 packages/phpPgAdmin/phpPgAdmin.spec:1.79
--- packages/phpPgAdmin/phpPgAdmin.spec:1.78	Fri May 14 11:35:56 2010
+++ packages/phpPgAdmin/phpPgAdmin.spec	Thu Sep 30 01:08:43 2010
@@ -5,12 +5,12 @@
 Summary:	phpPgAdmin - web-based PostgreSQL administration
 Summary(pl.UTF-8):	phpPgAdmin - administracja bazami PostgreSQL przez WWW
 Name:		phpPgAdmin
-Version:	4.2.3
-Release:	1
+Version:	5.0
+Release:	0.2
 License:	GPL v2+
 Group:		Applications/Databases/Interfaces
-Source0:	http://dl.sourceforge.net/phppgadmin/%{name}-%{version}.tar.bz2
-# Source0-md5:	29ce16a331bf2ca4f6d924fe35d4ada1
+Source0:	http://dl.sourceforge.net/phppgadmin/%{name}-%{version}-beta1.tar.bz2
+# Source0-md5:	7d026386eb3320be583f3710f3482eda
 Source1:	%{name}-apache.conf
 Source2:	%{name}-lighttpd.conf
 Source3:	http://www.quarto.pl/~gotar/%{name}-jscalendar.tar.bz2
@@ -48,11 +48,12 @@
 przełączniki, widoki i funkcje (procedury składowane).
 
 %prep
-%setup -q -a3
+%setup -q -a3 -n %{name}-%{version}-beta1
 %patch0 -p1
 #%patch1 -p1
 %patch2 -p1
 mv conf/config.inc.php{-dist,}
+find . -name \*.orig -exec rm -f \{\} \;
 
 # remove language source files (or one wants to make -devel subpackage?)
 mv -f lang/translations.php .
@@ -66,7 +67,7 @@
 install -d $RPM_BUILD_ROOT{%{_appdir},%{_sysconfdir}}
 
 cp -a *.php *.txt *.js $RPM_BUILD_ROOT%{_appdir}
-cp -a classes help images lang libraries themes xloadtree $RPM_BUILD_ROOT%{_appdir}
+cp -a classes help images js lang libraries themes xloadtree $RPM_BUILD_ROOT%{_appdir}
 cp -a conf/*.php $RPM_BUILD_ROOT%{_sysconfdir}
 
 install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
@@ -173,6 +174,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.79  2010/09/29 23:08:43  gotar
+- upgraded to 5.0-beta1
+
 Revision 1.78  2010/05/14 09:35:56  gotar
 - upgraded to 4.2.3
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/phpPgAdmin/phpPgAdmin-calendar.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/phpPgAdmin/phpPgAdmin-config.patch?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/phpPgAdmin/phpPgAdmin.spec?r1=1.78&r2=1.79&f=u