packages: postgresql/postgresql-ac_version.patch, postgresql/postgresql.spe...
wrobell
wrobell at pld-linux.org
Thu Jul 2 15:50:53 CEST 2009
Author: wrobell Date: Thu Jul 2 13:50:53 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- merged changes for postgresql 8.4 from DEVEL branch
---- Files affected:
packages/postgresql:
postgresql-ac_version.patch (1.3 -> 1.4) , postgresql.spec (1.421 -> 1.422) , postgresql.sysconfig (1.22 -> 1.23) , slony1.sysconfig (1.1 -> 1.2)
---- Diffs:
================================================================
Index: packages/postgresql/postgresql-ac_version.patch
diff -u packages/postgresql/postgresql-ac_version.patch:1.3 packages/postgresql/postgresql-ac_version.patch:1.4
--- packages/postgresql/postgresql-ac_version.patch:1.3 Tue Feb 5 00:06:37 2008
+++ packages/postgresql/postgresql-ac_version.patch Thu Jul 2 15:50:47 2009
@@ -2,9 +2,9 @@
+++ postgresql-8.3RC1/configure.in 2008-01-07 22:23:50.888568429 +0000
@@ -19,10 +19,10 @@
- AC_INIT([PostgreSQL], [8.3RC1], [pgsql-bugs at postgresql.org])
+ AC_INIT([PostgreSQL], [8.4.0], [pgsql-bugs at postgresql.org])
--m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.59], [], [m4_fatal([Autoconf version 2.59 is required.
+-m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.61], [], [m4_fatal([Autoconf version 2.61 is required.
-Untested combinations of 'autoconf' and PostgreSQL versions are not
-recommended. You can remove the check from 'configure.in' but it is then
-your responsibility whether the result works or not.])])
@@ -12,6 +12,6 @@
+dnl Untested combinations of 'autoconf' and PostgreSQL versions are not
+dnl recommended. You can remove the check from 'configure.in' but it is then
+dnl your responsibility whether the result works or not.])])
- AC_COPYRIGHT([Copyright (c) 1996-2008, PostgreSQL Global Development Group])
+ AC_COPYRIGHT([Copyright (c) 1996-2009, PostgreSQL Global Development Group])
AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c])
AC_CONFIG_AUX_DIR(config)
================================================================
Index: packages/postgresql/postgresql.spec
diff -u packages/postgresql/postgresql.spec:1.421 packages/postgresql/postgresql.spec:1.422
--- packages/postgresql/postgresql.spec:1.421 Thu Jul 2 15:47:40 2009
+++ packages/postgresql/postgresql.spec Thu Jul 2 15:50:47 2009
@@ -11,6 +11,9 @@
# (disabled by default because it is a security risk)
#
+%define beta %{nil}
+%define mver 8.4
+
Summary: PostgreSQL Data Base Management System
Summary(de.UTF-8): PostgreSQL Datenbankverwaltungssystem
Summary(es.UTF-8): Gestor de Banco de Datos PostgreSQL
@@ -22,11 +25,11 @@
Summary(uk.UTF-8): PostgreSQL - система керування базами даних
Summary(zh_CN.UTF-8): PostgreSQL 客户端程序和库文件
Name: postgresql
-Version: 8.4.0
-Release: 0.1
+Version: %{mver}.0
+Release: 0.%{beta}.1
License: BSD
Group: Applications/Databases
-Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/%{name}-%{version}.tar.bz2
+Source0: ftp://ftp.postgresql.org/pub/source/v%{version}%{beta}/%{name}-%{version}%{beta}.tar.bz2
# Source0-md5: 1f172d5f60326e972837f58fa5acd130
Source1: %{name}.init
Source2: pgsql-Database-HOWTO-html.tar.gz
@@ -849,16 +852,15 @@
%endif
# find locales
-for f in libpq5 pg_controldata pg_dump pg_resetxlog pgscripts postgres psql initdb pg_ctl pg_config plpgsql ecpg ecpglib6 plperl plpgsql plpython pltcl; do
- %find_lang $f-8.4
+for f in libpq5 pg_controldata pg_dump pg_resetxlog pgscripts postgres psql initdb pg_ctl pg_config plpgsql ecpg ecpglib6 plperl plpgsql plpython; do
+ %find_lang $f-%{mver}
done
# merge locales
-cat pgscripts-8.4.lang pg_resetxlog-8.4.lang \
- postgres-8.4.lang pg_controldata-8.4.lang \
- > main-8.4.lang
-cat pg_dump-8.4.lang psql-8.4.lang initdb-8.4.lang \
- pg_ctl-8.4.lang > clients-8.4.lang
-cat ecpg-8.4.lang ecpglib6-8.4.lang > ecpg.lang
+cat pgscripts-%{mver}.lang pg_resetxlog-%{mver}.lang \
+ postgres-%{mver}.lang pg_controldata-%{mver}.lang \
+ > main-%{mver}.lang
+cat pg_dump-%{mver}.lang psql-%{mver}.lang initdb-%{mver}.lang \
+ pg_ctl-%{mver}.lang > clients-%{mver}.lang
# Remove Contrib documentation. We use macro %doc
rm -rf $RPM_BUILD_ROOT/contrib
@@ -930,7 +932,7 @@
%post ecpg -p /sbin/ldconfig
%postun ecpg -p /sbin/ldconfig
-%files -f main-8.4.lang
+%files -f main-%{mver}.lang
%defattr(644,root,root,755)
%doc COPYRIGHT README HISTORY doc/{FAQ*,README*,bug.template}
%attr(754,root,root) /etc/rc.d/init.d/postgresql
@@ -979,7 +981,7 @@
%doc doc/unpacked/* doc/src/FAQ howto
%{_examplesdir}/%{name}-%{version}
-%files libs -f libpq5-8.4.lang
+%files libs -f libpq5-%{mver}.lang
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libpq.so.*.*
%attr(755,root,root) %ghost %{_libdir}/libpq.so.5
@@ -1003,7 +1005,7 @@
%attr(755,root,root) %{_libdir}/libpgtypes.so
%{_includedir}/ecpg*
-%files devel -f pg_config-8.4.lang
+%files devel -f pg_config-%{mver}.lang
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/pg_config
%attr(755,root,root) %{_libdir}/libpq.so
@@ -1039,7 +1041,7 @@
%{_libdir}/libpgtypes.a
%{_libdir}/libpgport.a
-%files clients -f clients-8.4.lang
+%files clients -f clients-%{mver}.lang
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/clusterdb
%attr(755,root,root) %{_bindir}/createdb
@@ -1182,12 +1184,24 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.422 2009/07/02 13:50:47 wrobell
+- merged changes for postgresql 8.4 from DEVEL branch
+
Revision 1.421 2009/07/02 13:47:40 baggins
- switch to heimdal kerberos
- enable gssapi if build with kerberos
Revision 1.420 2009/07/01 17:01:03 radek
- updated to 8.4.0; NOTE: consider postgresql82 / postgresql83 and turning postgresql into a meta package
+
+Revision 1.417.2.5 2009/07/02 13:46:07 wrobell
+- ver. 8.4.0
+
+Revision 1.417.2.4 2009/05/23 20:27:34 wrobell
+- ver. 8.4 beta2
+
+Revision 1.417.2.3 2009/04/18 23:28:28 wrobell
+- use proper postgresql version in pretrans script
Revision 1.419 2009/06/25 18:07:37 radek
- release 3: include contrib/fuzzystrmatch
================================================================
================================================================
Index: packages/postgresql/slony1.sysconfig
diff -u packages/postgresql/slony1.sysconfig:1.1 packages/postgresql/slony1.sysconfig:1.2
--- packages/postgresql/slony1.sysconfig:1.1 Sun Feb 6 06:47:39 2005
+++ packages/postgresql/slony1.sysconfig Thu Jul 2 15:50:47 2009
@@ -5,6 +5,6 @@
# SLONY1_CLUSTERS='mycluster1 mycluster2'
# Set the connect string for each cluster
-# SLONY1_CONNECT_mycluster1='database=repltest username=repltest'
+# SLONY1_CONNECT_mycluster1='dbname=repltest user=repltest'
# Set passwords in /var/lib/slony1/.pgpass
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/postgresql/postgresql-ac_version.patch?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/postgresql/postgresql.spec?r1=1.421&r2=1.422&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/postgresql/postgresql.sysconfig?r1=1.22&r2=1.23&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/postgresql/slony1.sysconfig?r1=1.1&r2=1.2&f=u
More information about the pld-cvs-commit
mailing list