rpms/postgresql/F-7 ecpg_config.h, NONE, 1.1 postgresql-use-zoneinfo.patch, NONE, 1.1 .cvsignore, 1.36, 1.37 README.rpm-dist, 1.12, 1.13 postgresql.spec, 1.78, 1.79 sources, 1.37, 1.38

[Tom Lane (tgl)]

Author: tgl

Update of /cvs/pkgs/rpms/postgresql/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7969

Modified Files:
	.cvsignore README.rpm-dist postgresql.spec sources 
Added Files:
	ecpg_config.h postgresql-use-zoneinfo.patch 
Log Message:
Update to PostgreSQL 8.2.5 and pgtcl 1.6.0; sync package with devel head.


--- NEW FILE ecpg_config.h ---
/*
 * Kluge to support multilib installation of both 32- and 64-bit RPMS:
 * we need to arrange that header files that appear in both RPMs are
 * identical.  Hence, this file is architecture-independent and calls
 * in an arch-dependent file that will appear in just one RPM.
 *
 * To avoid breaking arches not explicitly supported by Red Hat, we
 * use this indirection file *only* on known multilib arches.
 *
 * Note: this may well fail if user tries to use gcc's -I- option.
 * But that option is deprecated anyway.
 */
#if defined(__x86_64__)
#include "ecpg_config_x86_64.h"
#elif defined(__i386__)
#include "ecpg_config_i386.h"
#elif defined(__ppc64__) || defined(__powerpc64__)
#include "ecpg_config_ppc64.h"
#elif defined(__ppc__) || defined(__powerpc__)
#include "ecpg_config_ppc.h"
#elif defined(__s390x__)
#include "ecpg_config_s390x.h"
#elif defined(__s390__)
#include "ecpg_config_s390.h"
#endif

postgresql-use-zoneinfo.patch:

--- NEW FILE postgresql-use-zoneinfo.patch ---
PostgreSQL includes its own copy of the zic timezone database, which is great
for ensuring portable results but not so great from a package maintenance
perspective.  Since the data is in the same format as is provided by the
Linux-standard /usr/share/zoneinfo files, we can avoid having to update
postgresql for timezone updates by just using those files instead.

Note: as of PG 8.3 this patch will be unnecessary; use configure's
--with-system-tzdata switch instead.


diff -Naur postgresql-8.2.4.orig/src/timezone/Makefile postgresql-8.2.4/src/timezone/Makefile
--- postgresql-8.2.4.orig/src/timezone/Makefile	2007-03-14 13:38:15.000000000 -0400
+++ postgresql-8.2.4/src/timezone/Makefile	2007-08-25 16:38:53.000000000 -0400
@@ -38,14 +38,12 @@
 	$(CC) $(CFLAGS) $(ZICOBJS) $(LDFLAGS) $(LIBS) -o $@$(X)
 
 install: all installdirs
-	./zic -d '$(DESTDIR)$(datadir)/timezone' -p '$(POSIXRULES)' $(TZDATAFILES)
 	$(MAKE) -C tznames $@
 
 installdirs:
 	$(mkinstalldirs) '$(DESTDIR)$(datadir)'
 
 uninstall:
-	rm -rf '$(DESTDIR)$(datadir)/timezone'
 	$(MAKE) -C tznames $@
 
 clean distclean maintainer-clean:
diff -Naur postgresql-8.2.4.orig/src/timezone/pgtz.c postgresql-8.2.4/src/timezone/pgtz.c
--- postgresql-8.2.4.orig/src/timezone/pgtz.c	2006-11-21 18:11:55.000000000 -0500
+++ postgresql-8.2.4/src/timezone/pgtz.c	2007-08-25 16:42:32.000000000 -0400
@@ -31,9 +31,6 @@
 pg_tz	   *global_timezone = NULL;
 
 
-static char tzdir[MAXPGPATH];
-static bool done_tzdir = false;
-
 static bool scan_directory_ci(const char *dirname,
 							  const char *fname, int fnamelen,
 							  char *canonname, int canonnamelen);
@@ -45,17 +42,10 @@
 /*
  * Return full pathname of timezone data directory
  */
-static char *
+static const char *
 pg_TZDIR(void)
 {
-	if (done_tzdir)
-		return tzdir;
-
-	get_share_path(my_exec_path, tzdir);
-	strlcpy(tzdir + strlen(tzdir), "/timezone", MAXPGPATH - strlen(tzdir));
-
-	done_tzdir = true;
-	return tzdir;
+	return "/usr/share/zoneinfo";
 }
 
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql/F-7/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- .cvsignore	24 Apr 2007 19:21:40 -0000	1.36
+++ .cvsignore	20 Sep 2007 20:46:59 -0000	1.37
@@ -1,5 +1,5 @@
-postgresql-8.2.4.tar.bz2
+postgresql-8.2.5.tar.bz2
 PyGreSQL-3.8.1.tgz
-pgtcl1.5.3.tar.gz
-pgtcldocs-20060909.zip
+pgtcl1.6.0.tar.gz
+pgtcldocs-20070115.zip
 postgresql-8.2.1-US.pdf


Index: README.rpm-dist
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql/F-7/README.rpm-dist,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- README.rpm-dist	13 Jan 2007 04:30:50 -0000	1.12
+++ README.rpm-dist	20 Sep 2007 20:46:59 -0000	1.13
@@ -218,7 +218,8 @@
 If any tests fail, see the file regression.diffs in that directory for details,
 and read the "Regression Tests" section of the PostgreSQL documentation to
 find out whether the differences are actually significant.  If you need help
-interpreting the results, contact the pgsql-ports list at postgresql.org.
+interpreting the results, contact the pgsql-ports list at postgresql.org or
+the pgsqlrpms-general list at pgfoundry.org.
 
 After testing, say "make clean" to remove the files generated by the test
 script.


Index: postgresql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql/F-7/postgresql.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- postgresql.spec	20 Jun 2007 19:46:59 -0000	1.78
+++ postgresql.spec	20 Sep 2007 20:46:59 -0000	1.79
@@ -80,8 +80,8 @@
 
 Summary: PostgreSQL client programs and libraries
 Name: postgresql
-Version: 8.2.4
-Release: 2%{?dist}
+Version: 8.2.5
+Release: 1%{?dist}
 License: BSD
 Group: Applications/Databases
 Url: http://www.postgresql.org/ 
@@ -91,13 +91,14 @@
 Source4: Makefile.regress
 Source5: pg_config.h
 Source6: README.rpm-dist
+Source7: ecpg_config.h
 Source14: postgresql.pam
 Source15: postgresql-bashprofile
 Source16: filter-requires-perl-Pg.sh
 Source17: http://www.postgresql.org/docs/manuals/postgresql-8.2.1-US.pdf
 Source18: ftp://ftp.pygresql.org/pub/distrib/PyGreSQL-3.8.1.tgz
-Source19: http://pgfoundry.org/projects/pgtclng/pgtcl1.5.3.tar.gz
-Source20: http://pgfoundry.org/projects/pgtclng/pgtcldocs-20060909.zip
+Source19: http://pgfoundry.org/projects/pgtclng/pgtcl1.6.0.tar.gz
+Source20: http://pgfoundry.org/projects/pgtclng/pgtcldocs-20070115.zip
 
 Patch1: rpm-pgsql.patch
 Patch3: postgresql-logging.patch
@@ -105,6 +106,7 @@
 Patch5: pgtcl-no-rpath.patch
 Patch6: postgresql-perl-rpath.patch
 Patch8: postgresql-prefer-ncurses.patch
+Patch9: postgresql-use-zoneinfo.patch
 
 BuildRequires: perl glibc-devel bison flex autoconf
 Prereq: /sbin/ldconfig initscripts
@@ -342,6 +344,7 @@
 # patch5 is applied later
 %patch6 -p1
 %patch8 -p1
+%patch9 -p1
 
 #call autoconf 2.53 or greater
 %aconfver
@@ -482,6 +485,8 @@
     install -m 644 %{SOURCE5} $RPM_BUILD_ROOT/usr/include/
     mv $RPM_BUILD_ROOT/usr/include/pgsql/server/pg_config.h $RPM_BUILD_ROOT/usr/include/pgsql/server/pg_config_`uname -i`.h
     install -m 644 %{SOURCE5} $RPM_BUILD_ROOT/usr/include/pgsql/server/
+    mv $RPM_BUILD_ROOT/usr/include/ecpg_config.h $RPM_BUILD_ROOT/usr/include/ecpg_config_`uname -i`.h
+    install -m 644 %{SOURCE7} $RPM_BUILD_ROOT/usr/include/
     ;;
   *)
     ;;
@@ -602,10 +607,6 @@
 if [ $1 -ge 1 ] ; then
 	/sbin/service postgresql condrestart >/dev/null 2>&1 || :
 fi
-if [ $1 = 0 ] ; then
-	userdel postgres >/dev/null 2>&1 || :
-	groupdel postgres >/dev/null 2>&1 || : 
-fi
 
 %if %plperl
 %post -p /sbin/ldconfig   plperl
@@ -745,7 +746,6 @@
 %{_datadir}/pgsql/postgres.shdescription
 %{_datadir}/pgsql/system_views.sql
 %{_datadir}/pgsql/*.sample
-%{_datadir}/pgsql/timezone/
 %{_datadir}/pgsql/timezonesets/
 %{_libdir}/pgsql/plpgsql.so
 %dir %{_datadir}/pgsql
@@ -822,6 +822,14 @@
 %endif
 
 %changelog
+* Thu Sep 20 2007 Tom Lane <tgl at redhat.com> 8.2.5-1
+- Update to PostgreSQL 8.2.5 and pgtcl 1.6.0
+- Fix multilib problem for /usr/include/ecpg_config.h (which is new in 8.2.x)
+- Use tzdata package's data files instead of private copy, so that
+  postgresql-server need not be turned for routine timezone updates
+- Don't remove postgres user/group during RPM uninstall, per Fedora
+  packaging guidelines
+
 * Wed Jun 20 2007 Tom Lane <tgl at redhat.com> 8.2.4-2
 - Fix oversight in postgresql-test makefile: pg_regress isn't a shell script
   anymore.  Per upstream bug 3398.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql/F-7/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- sources	24 Apr 2007 19:21:40 -0000	1.37
+++ sources	20 Sep 2007 20:46:59 -0000	1.38
@@ -1,5 +1,5 @@
-af7ec100a33c41bfb8d87b5e0ec2f44a  postgresql-8.2.4.tar.bz2
+bb1cd309ea72f070cb964736f5755847  postgresql-8.2.5.tar.bz2
 5575979dac93c9c5795d7693a8f91c86  PyGreSQL-3.8.1.tgz
-43ad97c7dd108fb7a165b4755d8aec32  pgtcl1.5.3.tar.gz
-a71b4aced6b0b068335f8e040e5b9fb6  pgtcldocs-20060909.zip
+25eda4bb40fb3d4ec9b205a1fdc1bbbc  pgtcl1.6.0.tar.gz
+8ce98e93b238c3329d0fe43810442c44  pgtcldocs-20070115.zip
 0c25dc2055e2fa9ff9d05afc9252e1f2  postgresql-8.2.1-US.pdf