- upgraded to 5.0-beta1

Changed files:
    phpPgAdmin-calendar.patch -> 1.2
    phpPgAdmin-config.patch -> 1.5
    phpPgAdmin.spec -> 1.79

diff --git a/phpPgAdmin-calendar.patch b/phpPgAdmin-calendar.patch
index 051adeccbeaf15a9001a80fb67d1fa0e0ed9b2e8..6fbbba3e49ddb48ad6270f57ac3b7f5b7934e031 100644 (file)
--- a/phpPgAdmin-calendar.patch
+++ b/phpPgAdmin-calendar.patch
@@ -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 @@ diff -ur phpPgAdmin-4.2.2.orig/classes/database/Postgres.php phpPgAdmin-4.2.2/cl
 +                              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

diff --git a/phpPgAdmin-config.patch b/phpPgAdmin-config.patch
index ce1a7c29bab2e28bffbfa1961b7f1665533aca59..ca857990f89c43167ea121570b4bee23e834367c 100644 (file)
--- a/phpPgAdmin-config.patch
+++ b/phpPgAdmin-config.patch
@@ -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';
 

diff --git a/phpPgAdmin.spec b/phpPgAdmin.spec
index 85104a5793e58a8cd9409dc9323182b395147ee0..4d31b11c28778de8d014edab1b7bc366091c3e9c 100644 (file)
--- a/phpPgAdmin.spec
+++ b/phpPgAdmin.spec
@@ -4,12 +4,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
@@ -47,11 +47,12 @@ podstawowe możliwości, jak i część bardziej zaawansowanych jak
 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 .
@@ -65,7 +66,7 @@ rm -rf $RPM_BUILD_ROOT
 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