rpms/postgresql/FC-3 rpm-multilib-7.4.11.patch, NONE, 1.1 .cvsignore, 1.21, 1.22 postgresql.spec, 1.43, 1.44 sources, 1.22, 1.23 rpm-multilib-7.4.8.patch, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Mon Jan 9 21:44:03 UTC 2006
Author: tgl
Update of /cvs/dist/rpms/postgresql/FC-3
In directory cvs.devel.redhat.com:/tmp/cvs-serv23128
Modified Files:
.cvsignore postgresql.spec sources
Added Files:
rpm-multilib-7.4.11.patch
Removed Files:
rpm-multilib-7.4.8.patch
Log Message:
Update to PostgreSQL 7.4.11; fix some old bugs already fixed in FC4.
rpm-multilib-7.4.11.patch:
config/python.m4 | 10 +++++++---
configure.in | 33 ++++++++++++++++++---------------
2 files changed, 25 insertions(+), 18 deletions(-)
--- NEW FILE rpm-multilib-7.4.11.patch ---
diff -Naur postgresql-7.4.1.orig/config/python.m4 postgresql-7.4.1/config/python.m4
--- postgresql-7.4.1.orig/config/python.m4 2003-09-02 02:01:48.000000000 +0300
+++ postgresql-7.4.1/config/python.m4 2003-11-18 21:29:47.000000000 +0200
@@ -25,7 +25,11 @@
python_version=`${PYTHON} -c "import sys; print sys.version[[:3]]"`
python_prefix=`${PYTHON} -c "import sys; print sys.prefix"`
python_execprefix=`${PYTHON} -c "import sys; print sys.exec_prefix"`
-python_configdir="${python_execprefix}/lib/python${python_version}/config"
+python_path=`${PYTHON} -c "from distutils import sysconfig; print sysconfig.get_config_vars('LIBDEST')[[0]]"`
+python_libpath=`${PYTHON} -c "from distutils import sysconfig; print sysconfig.get_config_vars('LIBDEST')[[0]][[5:]]"`
+python_configdir="${python_path}/config"
+python_moduledir="${python_path}/site-packages"
+python_moduleexecdir="${python_execprefix}/${python_libpath}/site-packages"
python_includespec="-I${python_prefix}/include/python${python_version}"
if test "$python_prefix" != "$python_execprefix"; then
python_includespec="-I${python_execprefix}/include/python${python_version} $python_includespec"
@@ -37,9 +41,9 @@
AC_SUBST(python_includespec)[]dnl
# This should be enough of a message.
if test "$python_prefix" != "$python_execprefix"; then
- AC_MSG_RESULT([$python_prefix/lib/python${python_version} and $python_execprefix/lib/python${python_version}])
+ AC_MSG_RESULT([$python_prefix/${python_libpath} and $python_execprefix/${python_libpath}])
else
- AC_MSG_RESULT([$python_prefix/lib/python${python_version}])
+ AC_MSG_RESULT([$python_prefix/${python_libpath}])
fi
])# _PGAC_CHECK_PYTHON_DIRS
diff -Naur postgresql-7.4.1.orig/configure.in postgresql-7.4.1/configure.in
--- postgresql-7.4.1.orig/configure.in 2003-11-16 23:33:50.000000000 +0200
+++ postgresql-7.4.1/configure.in 2003-11-18 21:31:09.000000000 +0200
@@ -19,12 +19,11 @@
dnl
dnl The GNU folks apparently haven't heard that some people don't use
dnl Texinfo. Use this sorcery to use "docdir" instead of "infodir".
-m4_define([info], [doc])
-m4_define([infodir], [docdir])
+dnl
+dnl Now use both docdir and infodir to work properly with RPM macros
+dnl (courtesy, Elliott Lee <sopwith at redhat.com>)
+dnl - Andrew Overholt <overholt at redhat.com> 10 December 2002
AC_INIT([PostgreSQL], [7.4.11], [pgsql-bugs at postgresql.org])
-m4_undefine([infodir])
-m4_undefine([info])
-AC_SUBST(docdir)
AC_PREREQ(2.53)
AC_COPYRIGHT([Copyright 2003 PostgreSQL Global Development Group])
@@ -40,6 +39,10 @@
template=
AC_MSG_CHECKING([which template to use])
+AC_ARG_WITH(docdir, [location for non-info documentation], , with_docdir=${datadir}/doc)
+docdir="$with_docdir"
+AC_SUBST(docdir)
+
PGAC_ARG_REQ(with, template, [],
[
case $withval in
@@ -442,8 +445,8 @@
if test -d "$krb4_prefix/include"; then
INCLUDES="$INCLUDES -I$krb4_prefix/include"
fi
- if test -d "$krb4_prefix/lib"; then
- LIBDIRS="$LIBDIRS -L$krb4_prefix/lib"
+ if test -d "$krb4_prefix/$LIBNAME"; then
+ LIBDIRS="$LIBDIRS -L$krb4_prefix/$LIBNAME"
fi
krb_srvtab="/etc/srvtab"
@@ -452,7 +455,7 @@
AC_SUBST(with_krb4)
-
+test -z "$LIBNAME" && LIBNAME=lib
#
# Kerberos 5
#
@@ -467,8 +470,8 @@
if test -d "$krb5_prefix/include"; then
INCLUDES="$INCLUDES -I$krb5_prefix/include"
fi
- if test -d "$krb5_prefix/lib"; then
- LIBDIRS="$LIBDIRS -L$krb5_prefix/lib"
+ if test -d "$krb5_prefix/$LIBNAME"; then
+ LIBDIRS="$LIBDIRS -L$krb5_prefix/$LIBNAME"
fi
krb_srvtab="FILE:\$(sysconfdir)/krb5.keytab"
@@ -485,7 +488,7 @@
AC_SUBST(krb_srvtab)
-
+test -z "$LIBNAME" && LIBNAME=lib
#
# Kerberos configuration parameters
#
@@ -496,7 +499,7 @@
AC_DEFINE_UNQUOTED([PG_KRB_SRVNAM], ["$with_krb_srvnam"],
[Define to the name of the PostgreSQL service principal in Kerberos. (--with-krb-srvnam=NAME)])
-
+test -z "$LIBNAME" && LIBNAME=lib
#
# PAM
#
@@ -533,8 +536,8 @@
if test -d "${openssl_prefix}/include" ; then
INCLUDES="$INCLUDES -I${openssl_prefix}/include"
fi
- if test -d "${openssl_prefix}/lib" ; then
- LIBDIRS="$LIBDIRS -L${openssl_prefix}/lib"
+ if test -d "${openssl_prefix}/$LIBNAME" ; then
+ LIBDIRS="$LIBDIRS -L${openssl_prefix}/$LIBNAME"
fi
])
@@ -597,7 +600,7 @@
case $host_os in sysv5*)
AC_CACHE_CHECK([whether ld -R works], [pgac_cv_prog_ld_R],
[
- pgac_save_LDFLAGS=$LDFLAGS; LDFLAGS="$LDFLAGS -Wl,-R/usr/lib"
+ pgac_save_LDFLAGS=$LDFLAGS; LDFLAGS="$LDFLAGS -Wl,-R/usr/$LIBNAME"
AC_TRY_LINK([], [], [pgac_cv_prog_ld_R=yes], [pgac_cv_prog_ld_R=no])
LDFLAGS=$pgac_save_LDFLAGS
])
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/postgresql/FC-3/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore 10 May 2005 17:02:35 -0000 1.21
+++ .cvsignore 9 Jan 2006 21:44:01 -0000 1.22
@@ -1,2 +1,2 @@
-postgresql-7.4.8.tar.bz2
+postgresql-7.4.11.tar.bz2
PyGreSQL-3.6.1.tgz
Index: postgresql.spec
===================================================================
RCS file: /cvs/dist/rpms/postgresql/FC-3/postgresql.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- postgresql.spec 4 Oct 2005 19:53:05 -0000 1.43
+++ postgresql.spec 9 Jan 2006 21:44:01 -0000 1.44
@@ -40,12 +40,11 @@
# Python major version.
%{expand: %%define pyver %(python -c 'import sys;print(sys.version[0:3])')}
-%{expand: %%define pynextver %(python -c 'import sys;print(float(sys.version[0:3])+0.1)')}
Summary: PostgreSQL client programs and libraries.
Name: postgresql
-Version: 7.4.8
+Version: 7.4.11
# Conventions for PostgreSQL Global Development Group RPM releases:
@@ -90,7 +89,7 @@
Patch8: postgresql-7.4-com_err.patch
Patch10: postgresql-7.4-selinux.patch
Patch11: postgresql-7.4-strerror.patch
-Buildrequires: perl glibc-devel bison flex
+Buildrequires: perl glibc-devel bison flex autoconf
Prereq: /sbin/ldconfig initscripts
%if %python
BuildPrereq: python-devel
@@ -288,7 +287,6 @@
Group: Applications/Databases
Requires: libpq.so
Requires: python mx
-Conflicts: python < %pyver, python >= %pynextver
Obsoletes: rh-postgresql-python
%description python
@@ -815,6 +813,11 @@
%endif
%changelog
+* Mon Jan 9 2006 Tom Lane <tgl at redhat.com> 7.4.11-1.FC3.1
+- Update to PostgreSQL 7.4.11
+- Add rpath to plperl.so (bug #162198)
+- Remove obsolete Conflicts: against other python versions (bug #166754)
+
* Tue May 10 2005 Tom Lane <tgl at redhat.com> 7.4.8-1.FC3.1
- Update to PostgreSQL 7.4.8 (includes security and data-loss fixes; see
bz#156727, CAN-2005-1409, CAN-2005-1410)
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/postgresql/FC-3/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources 10 May 2005 17:02:35 -0000 1.22
+++ sources 9 Jan 2006 21:44:01 -0000 1.23
@@ -1,2 +1,2 @@
-b79761ec3735b5851db44429e97bee88 postgresql-7.4.8.tar.bz2
+e56cded48379b80de577db15e4ed5a68 postgresql-7.4.11.tar.bz2
057c2d93f333ff2ed2177a8b87e19c0c PyGreSQL-3.6.1.tgz
--- rpm-multilib-7.4.8.patch DELETED ---
More information about the fedora-cvs-commits
mailing list