Hello community, here is the log from the commit of package postgresql for openSUSE:Factory checked in at Sun Oct 2 10:25:43 CEST 2011.
-------- --- openSUSE:Factory/postgresql/postgresql-libs.changes 2011-09-23 12:41:38.000000000 +0200 +++ /mounts/work_src_done/STABLE/postgresql/postgresql-libs.changes 2011-09-16 19:17:28.000000000 +0200 @@ -1,0 +2,11 @@ +Fri Sep 16 17:17:08 UTC 2011 - [email protected] + +- Add postgresql-devel to baselibs + +------------------------------------------------------------------- +Wed Jun 8 16:40:03 UTC 2011 - [email protected] + +- Revert the postgresql-libs package split for SLE in preparation + of submitting the package to SLE11-SP1. + +------------------------------------------------------------------- --- openSUSE:Factory/postgresql/postgresql.changes 2011-09-23 12:41:41.000000000 +0200 +++ /mounts/work_src_done/STABLE/postgresql/postgresql.changes 2011-06-08 18:44:07.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Jun 8 16:40:03 UTC 2011 - [email protected] + +- Revert the postgresql-libs package split for SLE in preparation + of submitting the package to SLE11-SP1. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ postgresql-libs.spec ++++++ --- /var/tmp/diff_new_pack.qCIHTE/_old 2011-10-02 10:25:34.000000000 +0200 +++ /var/tmp/diff_new_pack.qCIHTE/_new 2011-10-02 10:25:34.000000000 +0200 @@ -16,6 +16,11 @@ # +%if 0%{?sles_version} && %sles_version <= 11 +%define libs_package 1 +%else +%define libs_package 0 +%endif Name: postgresql-libs %define _name postgresql @@ -28,7 +33,7 @@ BuildRequires: openldap2-devel openssl-devel Summary: Basic Clients and Utilities for PostgreSQL Version: 9.0.4 -Release: 1 +Release: 2 %define pg_minor_version %(echo %version | sed -r 's/^([0-9]+\\.[0-9]+).*/\\1/') License: BSD3c(or similar) Group: Productivity/Databases/Tools @@ -64,8 +69,33 @@ HTML documentation for PostgreSQL can be found in the postgresql-docs package. -%package -n %libpq +%if %libs_package + +%package libs +License: BSD 3-Clause +Summary: Shared Libraries Required for PostgreSQL Clients +Group: Productivity/Databases/Clients +# bug437293 +%ifarch ppc64 +Obsoletes: postgresql-libs-64bit +%endif +# +Provides: postgresql-libs = %pg_minor_version +PreReq: sh-utils fileutils + +%description libs +PostgreSQL is an advanced object-relational database management system +that supports an extended subset of the SQL standard, including +transactions, foreign keys, subqueries, triggers, user-defined types +and functions. + +This package provides the essential shared libraries for (almost) any +PostgreSQL client program or interface. You will need to install this +package in order to use any other PostgreSQL package or any clients +that need to connect to a PostgreSQL server. +%else +%package -n %libpq License: BSD3c(or similar) Summary: Shared Libraries Required for PostgreSQL Clients Group: Productivity/Databases/Clients @@ -86,7 +116,6 @@ program or language bindings are using. %package -n %libecpg - License: BSD3c(or similar) Summary: Shared Libraries Required for PostgreSQL Clients Group: Productivity/Databases/Clients @@ -100,13 +129,17 @@ This package provides the runtime library of the embedded SQL C preprocessor for PostgreSQL. +%endif %package -n %_name-devel - License: BSD3c(or similar) Summary: PostgreSQL development header files and libraries Group: Productivity/Databases/Tools +%if %libs_package +Requires: postgresql-libs +%else Requires: %libpq %libecpg +%endif %description -n %_name-devel PostgreSQL is an advanced object-relational database management system @@ -183,8 +216,15 @@ %find_lang libpq5-%{pg_minor_version} %libpq.lang %find_lang ecpglib6-%{pg_minor_version} %libecpg.lang +cat %libpq.lang %libecpg.lang > postgresql-libs.lang %find_lang ecpg-%{pg_minor_version} %_name-devel.lang %find_lang pg_config-%{pg_minor_version} %_name-devel.lang +%if %libs_package + +%post -n postgresql-libs -p /sbin/ldconfig + +%postun -n postgresql-libs -p /sbin/ldconfig +%else %post -n %libpq -p /sbin/ldconfig @@ -193,17 +233,26 @@ %post -n %libecpg -p /sbin/ldconfig %postun -n %libecpg -p /sbin/ldconfig +%endif %clean rm -rf %buildroot rm -f %my_provides +%if %libs_package + +%files -n postgresql-libs -f postgresql-libs.lang +%else + %files -n %libpq -f %libpq.lang +%endif %defattr(-,root,root) %_libdir/libpq.so.* +%if !%libs_package %files -n %libecpg -f %libecpg.lang %defattr(-,root,root) +%endif %_libdir/libecpg*.so.* %_libdir/libpgtypes.so.* ++++++ postgresql.spec ++++++ --- /var/tmp/diff_new_pack.qCIHTE/_old 2011-10-02 10:25:34.000000000 +0200 +++ /var/tmp/diff_new_pack.qCIHTE/_new 2011-10-02 10:25:34.000000000 +0200 @@ -16,6 +16,11 @@ # +%if 0%{?sles_version} && %sles_version <= 11 +%define libs_package 1 +%else +%define libs_package 0 +%endif Name: postgresql BuildRequires: gettext-devel ncurses-devel readline-devel uuid-devel zlib-devel @@ -35,7 +40,7 @@ BuildRequires: openldap2-devel openssl-devel Summary: Basic Clients and Utilities for PostgreSQL Version: 9.0.4 -Release: 1 +Release: 2 %define pg_minor_version %(echo %version | sed -r 's/^([0-9]+\\.[0-9]+).*/\\1/') License: BSD3c(or similar) Group: Productivity/Databases/Tools @@ -71,8 +76,33 @@ HTML documentation for PostgreSQL can be found in the postgresql-docs package. -%package -n %libpq +%if %libs_package + +%package libs +License: BSD 3-Clause +Summary: Shared Libraries Required for PostgreSQL Clients +Group: Productivity/Databases/Clients +# bug437293 +%ifarch ppc64 +Obsoletes: postgresql-libs-64bit +%endif +# +Provides: postgresql-libs = %pg_minor_version +PreReq: sh-utils fileutils + +%description libs +PostgreSQL is an advanced object-relational database management system +that supports an extended subset of the SQL standard, including +transactions, foreign keys, subqueries, triggers, user-defined types +and functions. +This package provides the essential shared libraries for (almost) any +PostgreSQL client program or interface. You will need to install this +package in order to use any other PostgreSQL package or any clients +that need to connect to a PostgreSQL server. +%else + +%package -n %libpq License: BSD3c(or similar) Summary: Shared Libraries Required for PostgreSQL Clients Group: Productivity/Databases/Clients @@ -93,7 +123,6 @@ program or language bindings are using. %package -n %libecpg - License: BSD3c(or similar) Summary: Shared Libraries Required for PostgreSQL Clients Group: Productivity/Databases/Clients @@ -107,6 +136,7 @@ This package provides the runtime library of the embedded SQL C preprocessor for PostgreSQL. +%endif %package server License: BSD3c(or similar) @@ -168,11 +198,14 @@ PostgreSQL databases. %package -n %_name-devel - License: BSD3c(or similar) Summary: PostgreSQL development header files and libraries Group: Productivity/Databases/Tools +%if %libs_package +Requires: postgresql-libs +%else Requires: %libpq %libecpg +%endif %description -n %_name-devel PostgreSQL is an advanced object-relational database management system @@ -360,6 +393,7 @@ %if %buildall %find_lang libpq5-%{pg_minor_version} %libpq.lang %find_lang ecpglib6-%{pg_minor_version} %libecpg.lang +cat %libpq.lang %libecpg.lang > postgresql-libs.lang %find_lang ecpg-%{pg_minor_version} %_name-devel.lang %find_lang pg_config-%{pg_minor_version} %_name-devel.lang %endif @@ -387,6 +421,12 @@ groupadd -g 26 -o -r postgres >/dev/null 2>/dev/null || : useradd -g postgres -o -r -d /var/lib/pgsql -s /bin/bash \ -c "PostgreSQL Server" -u 26 postgres 2>/dev/null || : +%if %libs_package + +%post -n postgresql-libs -p /sbin/ldconfig + +%postun -n postgresql-libs -p /sbin/ldconfig +%else %post -n %libpq -p /sbin/ldconfig @@ -395,6 +435,7 @@ %post -n %libecpg -p /sbin/ldconfig %postun -n %libecpg -p /sbin/ldconfig +%endif %clean rm -rf %buildroot @@ -507,13 +548,20 @@ %_libdir/postgresql/plpython*.so %if %buildall +%if %libs_package + +%files -n postgresql-libs -f postgresql-libs.lang +%else %files -n %libpq -f %libpq.lang +%endif %defattr(-,root,root) %_libdir/libpq.so.* +%if !%libs_package %files -n %libecpg -f %libecpg.lang %defattr(-,root,root) +%endif %_libdir/libecpg*.so.* %_libdir/libpgtypes.so.* ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.qCIHTE/_old 2011-10-02 10:25:34.000000000 +0200 +++ /var/tmp/diff_new_pack.qCIHTE/_new 2011-10-02 10:25:34.000000000 +0200 @@ -1 +1,4 @@ libpq5 +postgresql-devel + requires -postgresql-<targettype> + requires "libpq5-<targettype> = <version>" ++++++ postgresql.spec.in ++++++ --- /var/tmp/diff_new_pack.qCIHTE/_old 2011-10-02 10:25:35.000000000 +0200 +++ /var/tmp/diff_new_pack.qCIHTE/_new 2011-10-02 10:25:35.000000000 +0200 @@ -15,6 +15,12 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # +%if 0%{?sles_version} && %sles_version <= 11 +%define libs_package 1 +%else +%define libs_package 0 +%endif + Name: postgresql IF_POSTGRES BuildRequires: gettext-devel zlib-devel ncurses-devel readline-devel uuid-devel @@ -70,6 +76,30 @@ HTML documentation for PostgreSQL can be found in the postgresql-docs package. +%if %libs_package +%package libs +License: BSD 3-Clause +Summary: Shared Libraries Required for PostgreSQL Clients +Group: Productivity/Databases/Clients +# bug437293 +%ifarch ppc64 +Obsoletes: postgresql-libs-64bit +%endif +# +Provides: postgresql-libs = %pg_minor_version +PreReq: sh-utils fileutils + +%description libs +PostgreSQL is an advanced object-relational database management system +that supports an extended subset of the SQL standard, including +transactions, foreign keys, subqueries, triggers, user-defined types +and functions. + +This package provides the essential shared libraries for (almost) any +PostgreSQL client program or interface. You will need to install this +package in order to use any other PostgreSQL package or any clients +that need to connect to a PostgreSQL server. +%else %package -n %libpq License: BSD3c(or similar) Summary: Shared Libraries Required for PostgreSQL Clients @@ -104,6 +134,7 @@ This package provides the runtime library of the embedded SQL C preprocessor for PostgreSQL. +%endif IF_POSTGRES %package server @@ -170,7 +201,11 @@ License: BSD3c(or similar) Summary: PostgreSQL development header files and libraries Group: Productivity/Databases/Tools +%if %libs_package +Requires: postgresql-libs +%else Requires: %libpq %libecpg +%endif %description -n %_name-devel PostgreSQL is an advanced object-relational database management system @@ -382,6 +417,7 @@ FI_POSTGRES %find_lang libpq5-%{pg_minor_version} %libpq.lang %find_lang ecpglib6-%{pg_minor_version} %libecpg.lang +cat %libpq.lang %libecpg.lang > postgresql-libs.lang %find_lang ecpg-%{pg_minor_version} %_name-devel.lang %find_lang pg_config-%{pg_minor_version} %_name-devel.lang IF_POSTGRES @@ -411,10 +447,15 @@ useradd -g postgres -o -r -d /var/lib/pgsql -s /bin/bash \ -c "PostgreSQL Server" -u 26 postgres 2>/dev/null || : FI_POSTGRES +%if %libs_package +%post -n postgresql-libs -p /sbin/ldconfig +%postun -n postgresql-libs -p /sbin/ldconfig +%else %post -n %libpq -p /sbin/ldconfig %postun -n %libpq -p /sbin/ldconfig %post -n %libecpg -p /sbin/ldconfig %postun -n %libecpg -p /sbin/ldconfig +%endif %clean rm -rf %buildroot @@ -529,12 +570,17 @@ %if %buildall FI_POSTGRES +%if %libs_package +%files -n postgresql-libs -f postgresql-libs.lang +%else %files -n %libpq -f %libpq.lang +%endif %defattr(-,root,root) %_libdir/libpq.so.* - +%if !%libs_package %files -n %libecpg -f %libecpg.lang %defattr(-,root,root) +%endif %_libdir/libecpg*.so.* %_libdir/libpgtypes.so.* continue with "q"... Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
