SVN Commit by dpage: r4224 - in branches/REL-1_2_0_PATCHES/pgadmin3: . pkg/fc1 pkg/mandrake pkg/redhat pkg/win32 src/include - Mailing list pgadmin-hackers

Author: dpage
Date: 2005-05-20 09:45:58 +0100 (Fri, 20 May 2005)
New Revision: 4224

Modified:
   branches/REL-1_2_0_PATCHES/pgadmin3/configure.ac
   branches/REL-1_2_0_PATCHES/pgadmin3/pkg/fc1/pgadmin3.spec
   branches/REL-1_2_0_PATCHES/pgadmin3/pkg/mandrake/pgadmin3.spec
   branches/REL-1_2_0_PATCHES/pgadmin3/pkg/redhat/pgadmin3.spec
   branches/REL-1_2_0_PATCHES/pgadmin3/pkg/win32/pgadmin3.wsi
   branches/REL-1_2_0_PATCHES/pgadmin3/pkg/win32/pgadmin3.wsm
   branches/REL-1_2_0_PATCHES/pgadmin3/src/include/version.h
Log:
Version number bumps

Modified: branches/REL-1_2_0_PATCHES/pgadmin3/configure.ac
===================================================================
--- branches/REL-1_2_0_PATCHES/pgadmin3/configure.ac    2005-05-20 08:35:17 UTC (rev 4223)
+++ branches/REL-1_2_0_PATCHES/pgadmin3/configure.ac    2005-05-20 08:45:58 UTC (rev 4224)
@@ -1,7 +1,7 @@
 AC_PREREQ(2.57)
 AC_REVISION($Revision$)
 AC_COPYRIGHT(Copyright 2002 - 2004 The pgAdmin Development Team)
-AC_INIT(pgadmin3, 1.2.1, pgadmin-support@postgresql.org)
+AC_INIT(pgadmin3, 1.2.2, pgadmin-support@postgresql.org)
 AC_CONFIG_AUX_DIR(config)
 AC_CONFIG_SRCDIR([src/pgAdmin3.cpp])
 AM_CONFIG_HEADER([config.h])

Modified: branches/REL-1_2_0_PATCHES/pgadmin3/pkg/fc1/pgadmin3.spec
===================================================================
--- branches/REL-1_2_0_PATCHES/pgadmin3/pkg/fc1/pgadmin3.spec    2005-05-20 08:35:17 UTC (rev 4223)
+++ branches/REL-1_2_0_PATCHES/pgadmin3/pkg/fc1/pgadmin3.spec    2005-05-20 08:45:58 UTC (rev 4224)
@@ -1,11 +1,11 @@
-%define wxGTK_version 2.5.3
-%define pg_version 8.0.0beta5
+%define wxGTK_version 2.6.0
+%define pg_version 8.0.3
 %define withwxconfig wx-config
 %define desktop_vendor pgadmin

 Summary: Graphical client for PostgreSQL
 Name: pgadmin3
-Version: 1.2.0
+Version: 1.2.2
 Release: 3
 License: Artistic
 Group: Applications/Databases

Modified: branches/REL-1_2_0_PATCHES/pgadmin3/pkg/mandrake/pgadmin3.spec
===================================================================
--- branches/REL-1_2_0_PATCHES/pgadmin3/pkg/mandrake/pgadmin3.spec    2005-05-20 08:35:17 UTC (rev 4223)
+++ branches/REL-1_2_0_PATCHES/pgadmin3/pkg/mandrake/pgadmin3.spec    2005-05-20 08:45:58 UTC (rev 4224)
@@ -1,7 +1,7 @@
 %define name        pgadmin3
-%define major_version     1.2.0
+%define major_version     1.2.2
 %define minor_version     1mdk
-%define wxGTK2_version     2.5.3
+%define wxGTK2_version     2.6.0
 %define withwxconfig     wx-config
 %define desktop_vendor     pgadmin
 %define debug_package     %{nil}
@@ -19,14 +19,8 @@
 BuildRoot:     %{_tmppath}/%{name}-root
 BuildRequires:  postgresql postgresql-devel

-#
-# When rebuilding, wxWindows 2.5 CVS version is needed.
-# wxWindows 2.5 CVS (RPM and SRPMs) snapshots can be downloaded from
-# http://www.pgadmin.org/pgadmin3/development.php page in the Snapshots section
-#
+#BuildRequires: wxGTK2ud >= 2.6-%{wxGTK2_version}, wxGTK2ud-devel >= 2.6-%{wxGTK2_version}, wxGTK2ud-stc >=
2.6-%{wxGTK2_version}

-#BuildRequires: wxGTK2ud >= 2.5-%{wxGTK2_version}, wxGTK2ud-devel >= 2.5-%{wxGTK2_version}, wxGTK2ud-stc >=
2.5-%{wxGTK2_version},wxGTK2ud-xrc >= 2.5-%{wxGTK2_version} 
-
 %description
 PostgreSQL Tools.


Modified: branches/REL-1_2_0_PATCHES/pgadmin3/pkg/redhat/pgadmin3.spec
===================================================================
--- branches/REL-1_2_0_PATCHES/pgadmin3/pkg/redhat/pgadmin3.spec    2005-05-20 08:35:17 UTC (rev 4223)
+++ branches/REL-1_2_0_PATCHES/pgadmin3/pkg/redhat/pgadmin3.spec    2005-05-20 08:45:58 UTC (rev 4224)
@@ -1,7 +1,7 @@
-%define major_version 1.1.0
+%define major_version 1.2.2
 %define minor_version %(date +%Y%m%d)
-%define wxGTK2_version 20031010.8
-%define withwxconfig wxgtk2ud-2.5-config
+%define wxGTK2_version 2.6.0
+%define withwxconfig wxgtk2ud-2.6-config
 %define desktop_vendor pgadmin
 %define debug_package %{nil}
 %define __os_install_post /usr/lib/rpm/brp-compress
@@ -17,14 +17,8 @@
 Packager: pgAdmin project <pgadmin-hackers@postgresql.org>
 BuildRoot: %{_tmppath}/%{name}-root

-#
-# When rebuilding, wxWindows 2.5 CVS version is needed.
-# wxWindows 2.5 CVS (RPM and SRPMs) snapshots can be downloaded from
-# http://www.pgadmin.org/pgadmin3/development.php page in the Snapshots section
-#
+BuildRequires: wxGTK2ud >= 2.6-%{wxGTK2_version}, wxGTK2ud-devel >= 2.6-%{wxGTK2_version}, wxGTK2ud-stc >=
2.6-%{wxGTK2_version}

-BuildRequires: wxGTK2ud >= 2.5-%{wxGTK2_version}, wxGTK2ud-devel >= 2.5-%{wxGTK2_version}, wxGTK2ud-stc >=
2.5-%{wxGTK2_version},wxGTK2ud-xrc >= 2.5-%{wxGTK2_version} 
-
 %description
 PostgreSQL Tools.


Modified: branches/REL-1_2_0_PATCHES/pgadmin3/pkg/win32/pgadmin3.wsi
===================================================================
(Binary files differ)

Modified: branches/REL-1_2_0_PATCHES/pgadmin3/pkg/win32/pgadmin3.wsm
===================================================================
(Binary files differ)

Modified: branches/REL-1_2_0_PATCHES/pgadmin3/src/include/version.h
===================================================================
--- branches/REL-1_2_0_PATCHES/pgadmin3/src/include/version.h    2005-05-20 08:35:17 UTC (rev 4223)
+++ branches/REL-1_2_0_PATCHES/pgadmin3/src/include/version.h    2005-05-20 08:45:58 UTC (rev 4224)
@@ -11,9 +11,9 @@


 // Application Versions
-#define VERSION_STR     wxT("1.2.1")
-#define VERSION_NUM     1,2,1,0
-#define VERSION_PACKAGE 1.2.1
+#define VERSION_STR     wxT("1.2.2")
+#define VERSION_NUM     1,2,2,0
+#define VERSION_PACKAGE 1.2.2

 #define PRERELEASE 0
 // #define BUILD "..."