rpms/postgresql/FC-6 postgresql-use-zoneinfo.patch, NONE, 1.1 .cvsignore, 1.36, 1.37 postgresql.spec, 1.74, 1.75 sources, 1.37, 1.38

Thu Sep 20 21:44:51 UTC 2007

Author: tgl

Update of /cvs/dist/rpms/postgresql/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv12165

Modified Files:
	.cvsignore postgresql.spec sources 
Added Files:
	postgresql-use-zoneinfo.patch 
Log Message:
Update to PostgreSQL 8.1.10, remove local copy of tzdata

postgresql-use-zoneinfo.patch:
 Makefile |    1 -
 pgtz.c   |   12 +-----------
 2 files changed, 1 insertion(+), 12 deletions(-)

--- 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.1.10.orig/src/timezone/Makefile postgresql-8.1.10/src/timezone/Makefile
--- postgresql-8.1.10.orig/src/timezone/Makefile	2007-03-14 13:38:22.000000000 -0400
+++ postgresql-8.1.10/src/timezone/Makefile	2007-09-20 17:28:16.000000000 -0400
@@ -38,7 +38,6 @@
 	$(CC) $(CFLAGS) $(ZICOBJS) $(LDFLAGS) $(LIBS) -o $@$(X)
 
 install: all installdirs
-	./zic -d $(DESTDIR)$(datadir)/timezone -p $(POSIXRULES) $(TZDATAFILES)
 
 installdirs:
 	$(mkinstalldirs) $(DESTDIR)$(datadir)
diff -Naur postgresql-8.1.10.orig/src/timezone/pgtz.c postgresql-8.1.10/src/timezone/pgtz.c
--- postgresql-8.1.10.orig/src/timezone/pgtz.c	2005-11-22 13:23:31.000000000 -0500
+++ postgresql-8.1.10/src/timezone/pgtz.c	2007-09-20 17:29:24.000000000 -0400
@@ -32,9 +32,6 @@
 pg_tz	   *global_timezone = NULL;
 
 
-static char tzdir[MAXPGPATH];
-static int	done_tzdir = 0;
-
 static const char *identify_system_timezone(void);
 static const char *select_default_timezone(void);
 static bool set_global_timezone(const char *tzname);
@@ -46,14 +43,7 @@
 char *
 pg_TZDIR(void)
 {
-	if (done_tzdir)
-		return tzdir;
-
-	get_share_path(my_exec_path, tzdir);
-	strcat(tzdir, "/timezone");
-
-	done_tzdir = 1;
-	return tzdir;
+	return "/usr/share/zoneinfo";
 }
 
 


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/postgresql/FC-6/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- .cvsignore	24 Apr 2007 19:49:40 -0000	1.36
+++ .cvsignore	20 Sep 2007 21:44:49 -0000	1.37
@@ -1,4 +1,4 @@
-postgresql-8.1.9.tar.bz2
+postgresql-8.1.10.tar.bz2
 PyGreSQL-3.8.1.tgz
 pgtcl1.5.2.tar.gz
 pgtcldocs-20041108.zip


Index: postgresql.spec
===================================================================
RCS file: /cvs/dist/rpms/postgresql/FC-6/postgresql.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- postgresql.spec	24 Apr 2007 19:49:40 -0000	1.74
+++ postgresql.spec	20 Sep 2007 21:44:49 -0000	1.75
@@ -81,7 +81,7 @@
 
 Summary: PostgreSQL client programs and libraries.
 Name: postgresql
-Version: 8.1.9
+Version: 8.1.10
 Release: 1%{?dist}
 License: BSD
 Group: Applications/Databases
@@ -112,6 +112,7 @@
 Patch5: pgtcl-no-rpath.patch
 Patch6: postgresql-perl-rpath.patch
 Patch7: pgtcl-quote.patch
+Patch9: postgresql-use-zoneinfo.patch
 
 Buildrequires: perl glibc-devel bison flex autoconf
 Prereq: /sbin/ldconfig initscripts
@@ -333,6 +334,7 @@
 # patch5 is applied later
 %patch6 -p1
 # patch7 is applied later
+%patch9 -p1
 
 #call autoconf 2.53 or greater
 %aconfver
@@ -750,7 +752,6 @@
 %{_datadir}/pgsql/postgres.description
 %{_datadir}/pgsql/system_views.sql
 %{_datadir}/pgsql/*.sample
-%{_datadir}/pgsql/timezone/
 %{_libdir}/pgsql/plpgsql.so
 %dir %{_datadir}/pgsql
 %attr(700,postgres,postgres) %dir /var/lib/pgsql
@@ -828,6 +829,11 @@
 %endif
 
 %changelog
+* Thu Sep 20 2007 Tom Lane <tgl at redhat.com> 8.1.10-1
+- Update to PostgreSQL 8.1.10
+- Use tzdata package's data files instead of private copy, so that
+  postgresql-server need not be turned for routine timezone updates
+
 * Tue Apr 24 2007 Tom Lane <tgl at redhat.com> 8.1.9-1
 - Update to PostgreSQL 8.1.9 for CVE-2007-2138, data loss bugs
 Resolves: #237682


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/postgresql/FC-6/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- sources	24 Apr 2007 19:49:41 -0000	1.37
+++ sources	20 Sep 2007 21:44:49 -0000	1.38
@@ -1,4 +1,4 @@
-a8a3bd5cb45c4c2747d5218912a82cfc  postgresql-8.1.9.tar.bz2
+b3f29251035d2ee03f66e3114cf6f095  postgresql-8.1.10.tar.bz2
 5575979dac93c9c5795d7693a8f91c86  PyGreSQL-3.8.1.tgz
 d19dfdcb54c334495d32456a043e0232  pgtcl1.5.2.tar.gz
 3d504b46231914d61fd49175f67e8715  pgtcldocs-20041108.zip


