OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 12-Jul-2009 11:04:30
Branch: HEAD Handle: 2009071210042900
Modified files:
openpkg-src/postgresql postgresql.patch postgresql.spec
Log:
upgrading package: postgresql 8.3.7 -> 8.4.0
Summary:
Revision Changes Path
1.6 +18 -6 openpkg-src/postgresql/postgresql.patch
1.280 +8 -16 openpkg-src/postgresql/postgresql.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/postgresql/postgresql.patch
============================================================================
$ cvs diff -u -r1.5 -r1.6 postgresql.patch
--- openpkg-src/postgresql/postgresql.patch 2 Apr 2008 08:29:47 -0000
1.5
+++ openpkg-src/postgresql/postgresql.patch 12 Jul 2009 09:04:29 -0000
1.6
@@ -1,7 +1,19 @@
+Index: src/Makefile.shlib
+--- src/Makefile.shlib.orig 2009-01-05 10:27:19 +0100
++++ src/Makefile.shlib 2009-07-12 10:25:42 +0200
+@@ -339,7 +339,7 @@
+
+ .PHONY: all-lib all-static-lib all-shared-lib
+
+-all-lib: all-shared-lib
++all-lib:
+ ifdef soname
+ # no static library when building a dynamically loadable module
+ all-lib: all-static-lib
Index: src/backend/Makefile
---- src/backend/Makefile.orig 2007-08-21 03:11:12 +0200
-+++ src/backend/Makefile 2007-10-09 12:37:14 +0200
-@@ -30,7 +30,7 @@
+--- src/backend/Makefile.orig 2009-01-01 18:23:34 +0100
++++ src/backend/Makefile 2009-07-12 10:25:01 +0200
+@@ -32,7 +32,7 @@
LIBS := $(filter-out -lpgport, $(LIBS)) $(LDAP_LIBS_BE)
# The backend doesn't need everything that's in LIBS, however
@@ -11,9 +23,9 @@
##########################################################################
Index: src/include/port.h
---- src/include/port.h.orig 2007-09-29 00:25:49 +0200
-+++ src/include/port.h 2007-10-09 12:30:19 +0200
-@@ -329,7 +329,7 @@
+--- src/include/port.h.orig 2009-06-11 16:49:08 +0200
++++ src/include/port.h 2009-07-12 10:25:01 +0200
+@@ -360,7 +360,7 @@
extern int getopt(int nargc, char *const * nargv, const char *ostr);
#endif
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/postgresql/postgresql.spec
============================================================================
$ cvs diff -u -r1.279 -r1.280 postgresql.spec
--- openpkg-src/postgresql/postgresql.spec 9 May 2009 08:22:50 -0000
1.279
+++ openpkg-src/postgresql/postgresql.spec 12 Jul 2009 09:04:29 -0000
1.280
@@ -22,14 +22,14 @@
##
# package versions
-%define V_postgresql 8.3.7
-%define V_postgresql_dist 8.3.7
-%define V_postgresql_dir 8.3.7
+%define V_postgresql 8.4.0
+%define V_postgresql_dist 8.4.0
+%define V_postgresql_dir 8.4.0
%define V_libpqxx 3.0
%define V_perl 5.8.8
%define V_pgperl 2.0.2
%define V_psqlodbc 08.03.0400
-%define V_pgjdbc 8.3-604
+%define V_pgjdbc 8.4-701
%define V_slony1_major 1.2
%define V_slony1_minor 16
%define V_pgcluster 1.9.0rc5
@@ -48,7 +48,7 @@
Group: Database
License: GPL
Version: %{V_postgresql}
-Release: 20090509
+Release: 20090712
# package options
%option with_server yes
@@ -62,7 +62,6 @@
%option with_pgcluster no
%option with_kerberos no
%option with_mysqlcompat no
-%option with_int_datetime no
%option with_xml no
%option with_conversion no
@@ -238,10 +237,6 @@
%{l_shtool} subst \
-e '/^all:/{x;s/.*/enable_shared = yes/;G;}' \
src/backend/utils/mb/conversion_procs/proc.mk
-%else
- %{l_shtool} subst \
- -e 's;$(INSTALL_SHLIB);#$(INSTALL_SHLIB);g' \
- src/backend/utils/mb/conversion_procs/proc.mk
%endif
%{l_shtool} subst \
-e 's;# Shared library stuff;enable_shared = yes;g' \
@@ -281,6 +276,7 @@
./configure \
--cache-file=./config.cache \
--prefix=%{l_prefix} \
+ --mandir=%{l_prefix}/man \
--sysconfdir=%{l_prefix}/etc/postgresql \
--includedir=%{l_prefix}/include/postgresql \
--with-openssl \
@@ -298,14 +294,10 @@
--with-krb5 \
--with-krb-srvnam=postgresql \
%endif
-%if "%{with_int_datetime}" == "yes"
- --enable-integer-datetimes \
-%endif
%if "%{with_xml}" == "yes"
--with-libxml \
--with-libxslt \
%endif
- --disable-syslog \
--disable-shared
# build package
@@ -431,7 +423,7 @@
%{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
# strip down installation
- rm -rf $RPM_BUILD_ROOT%{l_prefix}/doc
+ rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/doc
strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
rm -f $RPM_BUILD_ROOT%{l_prefix}/man/man1/pgaccess.1
rm -f $RPM_BUILD_ROOT%{l_prefix}/man/man1/pgtclsh.1
@@ -440,7 +432,7 @@
# namespace adjustments to installation
for prog in \
createdb createlang createuser dropdb droplang clusterdb \
- dropuser initdb ipcclean vacuumdb reindexdb; do
+ dropuser initdb vacuumdb reindexdb; do
%if "%{with_compat}" == "yes"
cmd="ln"
%else
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
