From 5965bd71b6b4a0f119137b0372fef3749d3ae071 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Jun 11 2008 16:33:03 +0000 Subject: Update to PostgreSQL 8.3.3; sync with rawhide --- diff --git a/.cvsignore b/.cvsignore index e46e082..c9c6149 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,5 +1,5 @@ -postgresql-8.3.1.tar.bz2 +postgresql-8.3.3.tar.bz2 PyGreSQL-3.8.1.tgz pgtcl1.6.2.tar.gz pgtcldocs-20070115.zip -postgresql-8.3.1-US.pdf +postgresql-8.3.3-US.pdf diff --git a/postgresql-prefer-ncurses.patch b/postgresql-prefer-ncurses.patch deleted file mode 100644 index 04a4efb..0000000 --- a/postgresql-prefer-ncurses.patch +++ /dev/null @@ -1,20 +0,0 @@ -This patch hacks the Postgres configure script to prefer libncurses over -libtermcap. This is needed in the current Fedora environment because while -both are available, libtermcap is deprecated and will be removed in the -fairly near future. Because the need for this is short-term, I'm not -going to try to push it upstream; this patch can go away once libtermcap -is no longer present in the standard build environment. - - -diff -Naur postgresql-8.2.1.orig/config/programs.m4 postgresql-8.2.1/config/programs.m4 ---- postgresql-8.2.1.orig/config/programs.m4 2006-05-23 15:28:45.000000000 -0400 -+++ postgresql-8.2.1/config/programs.m4 2007-01-10 18:42:22.000000000 -0500 -@@ -88,7 +88,7 @@ - fi - for pgac_rllib in $READLINE_ORDER ; do - AC_MSG_CHECKING([for ${pgac_rllib}]) -- for pgac_lib in "" " -ltermcap" " -lncurses" " -lcurses" ; do -+ for pgac_lib in "" " -lncurses" " -ltermcap" " -lcurses" ; do - LIBS="${pgac_rllib}${pgac_lib} $pgac_save_LIBS" - AC_TRY_LINK_FUNC([readline], [[ - # Older NetBSD, OpenBSD, and Irix have a broken linker that does not diff --git a/postgresql.spec b/postgresql.spec index 7a0de9b..680a2b9 100755 --- a/postgresql.spec +++ b/postgresql.spec @@ -68,6 +68,7 @@ %{!?tcl:%define tcl 1} %{!?ssl:%define ssl 1} %{!?kerberos:%define kerberos 1} +%{!?ldap:%define ldap 1} %{!?nls:%define nls 1} %{!?uuid:%define uuid 1} %{!?xml:%define xml 1} @@ -81,8 +82,8 @@ Summary: PostgreSQL client programs and libraries Name: postgresql -Version: 8.3.1 -Release: 3%{?dist} +Version: 8.3.3 +Release: 1%{?dist} License: BSD Group: Applications/Databases Url: http://www.postgresql.org/ @@ -96,7 +97,7 @@ 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.3.1-US.pdf +Source17: http://www.postgresql.org/docs/manuals/postgresql-8.3.3-US.pdf Source18: ftp://ftp.pygresql.org/pub/distrib/PyGreSQL-3.8.1.tgz Source19: http://pgfoundry.org/projects/pgtclng/pgtcl1.6.2.tar.gz Source20: http://pgfoundry.org/projects/pgtclng/pgtcldocs-20070115.zip @@ -107,7 +108,6 @@ Patch3: postgresql-logging.patch Patch4: postgresql-test.patch Patch5: pgtcl-no-rpath.patch Patch6: postgresql-perl-rpath.patch -Patch8: postgresql-prefer-ncurses.patch BuildRequires: perl(ExtUtils::MakeMaker) glibc-devel bison flex autoconf gawk BuildRequires: perl(ExtUtils::Embed), perl-devel @@ -137,6 +137,10 @@ BuildRequires: krb5-devel BuildRequires: e2fsprogs-devel %endif +%if %ldap +BuildRequires: openldap-devel +%endif + %if %nls BuildRequires: gettext >= 0.10.35 %endif @@ -153,6 +157,9 @@ BuildRequires: libxml2-devel libxslt-devel BuildRequires: pam-devel %endif +# main package requires -libs subpackage +Requires: postgresql-libs = %{version}-%{release} + Obsoletes: postgresql-clients Obsoletes: postgresql-perl Obsoletes: postgresql-tk @@ -194,7 +201,7 @@ PostgreSQL server. Summary: The programs needed to create and run a PostgreSQL server Group: Applications/Databases Prereq: /usr/sbin/useradd /sbin/chkconfig -Prereq: postgresql = %{version}-%{release} libpq.so +Requires: postgresql = %{version}-%{release} Obsoletes: rh-postgresql-server %description server @@ -212,7 +219,7 @@ to install the postgresql package. %package docs Summary: Extra documentation for PostgreSQL Group: Applications/Databases -Prereq: postgresql = %{version}-%{release} +Requires: postgresql = %{version}-%{release} Obsoletes: rh-postgresql-docs %description docs @@ -224,7 +231,7 @@ the FAQ, and source files for the PostgreSQL tutorial. %package contrib Summary: Contributed source and binaries distributed with PostgreSQL Group: Applications/Databases -Prereq: postgresql = %{version}-%{release} +Requires: postgresql = %{version}-%{release} Obsoletes: rh-postgresql-contrib %description contrib @@ -235,8 +242,7 @@ included in the PostgreSQL distribution. %package devel Summary: PostgreSQL development header files and libraries Group: Development/Libraries -Prereq: postgresql = %{version}-%{release} -Requires: postgresql-libs = %{version}-%{release} +Requires: postgresql = %{version}-%{release} Obsoletes: rh-postgresql-devel %description devel @@ -251,8 +257,7 @@ develop applications which will interact with a PostgreSQL server. %package plperl Summary: The Perl procedural language for PostgreSQL Group: Applications/Databases -PreReq: postgresql = %{version}-%{release} -PreReq: postgresql-server = %{version}-%{release} +Requires: postgresql-server = %{version}-%{release} Obsoletes: rh-postgresql-pl Obsoletes: postgresql-pl Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) @@ -268,8 +273,7 @@ procedural language for the backend. %package plpython Summary: The Python procedural language for PostgreSQL Group: Applications/Databases -PreReq: postgresql = %{version}-%{release} -PreReq: postgresql-server = %{version}-%{release} +Requires: postgresql-server = %{version}-%{release} Obsoletes: rh-postgresql-pl Obsoletes: postgresql-pl @@ -284,8 +288,7 @@ procedural language for the backend. %package pltcl Summary: The Tcl procedural language for PostgreSQL Group: Applications/Databases -PreReq: postgresql = %{version}-%{release} -PreReq: postgresql-server = %{version}-%{release} +Requires: postgresql-server = %{version}-%{release} Obsoletes: rh-postgresql-pl Obsoletes: postgresql-pl @@ -300,6 +303,7 @@ procedural language for the backend. %package tcl Summary: A Tcl client library for PostgreSQL Group: Applications/Databases +# this is intentionally not a version-specific Requires: Requires: libpq.so Requires: tcl >= 8.3 Obsoletes: rh-postgresql-tcl @@ -315,6 +319,7 @@ and its documentation. %package python Summary: Development module for Python code to access a PostgreSQL DB Group: Applications/Databases +# this is intentionally not a version-specific Requires: Requires: libpq.so Requires: python mx Obsoletes: rh-postgresql-python @@ -331,8 +336,7 @@ database. %package test Summary: The test suite distributed with PostgreSQL Group: Applications/Databases -PreReq: postgresql = %{version}-%{release} -PreReq: postgresql-server = %{version}-%{release} +Requires: postgresql-server = %{version}-%{release} Obsoletes: rh-postgresql-test %description test @@ -352,7 +356,7 @@ system, including regression tests and benchmarks. %patch4 -p1 # patch5 is applied later %patch6 -p1 -%patch8 -p1 + #call autoconf 2.53 or greater %aconfver @@ -390,6 +394,10 @@ CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS # Strip out -ffast-math from CFLAGS.... CFLAGS=`echo $CFLAGS|xargs -n 1|grep -v ffast-math|xargs -n 100` +# Use --as-needed to eliminate unnecessary link dependencies. +# Hopefully upstream will do this for itself in some future release. +LDFLAGS="-Wl,--as-needed"; export LDFLAGS + %configure --disable-rpath \ %if %beta --enable-debug \ @@ -405,6 +413,9 @@ CFLAGS=`echo $CFLAGS|xargs -n 1|grep -v ffast-math|xargs -n 100` %if %plpython --with-python \ %endif +%if %ldap + --with-ldap \ +%endif %if %ssl --with-openssl \ %endif @@ -840,6 +851,18 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Wed Jun 11 2008 Tom Lane 8.3.3-1 +- Update to PostgreSQL 8.3.3. +- Remove postgresql-prefer-ncurses.patch, no longer needed in recent + Fedora releases because libtermcap is gone. +- Enable LDAP support +Resolves: #445315 +- Use -Wl,--as-needed to suppress bogus dependencies for libraries that + are really only needed by some of the subpackages +- Clean up cross-subpackage Requires: to ensure that updating any one + subpackage brings in the matching versions of others. +Resolves: #444271 + * Fri May 22 2008 Dennis Gilmore 8.3.1-2 - at Tom's request remove conditionalised patch letting sparc64 builds fail diff --git a/sources b/sources index 6b4d272..4fa4a87 100644 --- a/sources +++ b/sources @@ -1,5 +1,5 @@ -a5e0ed6a85b450dc217ec71da93243a7 postgresql-8.3.1.tar.bz2 +0ae4bd9620e84d3e08dcf923808d14d0 postgresql-8.3.3.tar.bz2 5575979dac93c9c5795d7693a8f91c86 PyGreSQL-3.8.1.tgz abf26e3cd7f8229f468045ed1fb7e748 pgtcl1.6.2.tar.gz 8ce98e93b238c3329d0fe43810442c44 pgtcldocs-20070115.zip -5b8a011a414c7af37938cd45a98a0ed0 postgresql-8.3.1-US.pdf +62043e967e738d93e6f0402ba152f6de postgresql-8.3.3-US.pdf