From 9edad88af50bd0e9a6f012bef8028d0560ee61caf18ba9eee9ed73c9894a15c1 Mon Sep 17 00:00:00 2001 From: Reinhard Max Date: Thu, 11 Mar 2010 17:25:26 +0000 Subject: [PATCH 1/6] Fix build for SLES9 in OBS OBS-URL: https://build.opensuse.org/package/show/server:database:postgresql/postgresql?expand=0&rev=28 --- postgresql-pl.changes | 5 +++++ postgresql-pl.spec | 13 ++++++++----- postgresql.changes | 10 ++++++++++ postgresql.spec | 23 +++++++++++++---------- ready | 0 5 files changed, 36 insertions(+), 15 deletions(-) delete mode 100644 ready diff --git a/postgresql-pl.changes b/postgresql-pl.changes index be13a3e..0e11d4b 100644 --- a/postgresql-pl.changes +++ b/postgresql-pl.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Mar 11 18:24:28 CET 2010 - max@suse.de + +- Disable GSSAPI, XML, kerberos and make check in OBS for SLES9. + ------------------------------------------------------------------- Tue Feb 9 14:11:37 CET 2010 - max@suse.de diff --git a/postgresql-pl.spec b/postgresql-pl.spec index ff3cc9a..db06e78 100644 --- a/postgresql-pl.spec +++ b/postgresql-pl.spec @@ -15,12 +15,13 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - - Name: postgresql-pl -BuildRequires: bison flex gettext-devel krb5-devel libxml2-devel libxslt-devel -BuildRequires: openldap2-devel openssl-devel pam-devel readline-devel +BuildRequires: bison flex gettext-devel +BuildRequires: openldap2-devel openssl-devel pam-devel readline-devel zlib-devel BuildRequires: ncurses-devel +%if 0%{?suse_version} > 910 +BuildRequires: krb5-devel libxslt-devel +%endif BuildRequires: python-devel tcl-devel Summary: The PL/Tcl, PL/Perl, and PL/Python Procedural Languages for PostgreSQL Version: 8.4.2 @@ -133,11 +134,13 @@ export CFLAGS="%optflags $SP" --with-tclconfig=%_libdir \ --with-openssl \ --with-pam \ + --with-ldap \ +%if 0%{?suse_version} > 910 --with-krb5 \ --with-gssapi \ - --with-ldap \ --with-libxml \ --with-libxslt \ +%endif --with-system-tzdata=/usr/share/zoneinfo # fmgroids.h is needed for plperl make -C src/backend ../../src/include/utils/fmgroids.h diff --git a/postgresql.changes b/postgresql.changes index 9621385..b05c444 100644 --- a/postgresql.changes +++ b/postgresql.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu Mar 11 18:23:38 CET 2010 - max@suse.de + +- Disable GSSAPI, XML, kerberos and make check in OBS for SLES9. + +------------------------------------------------------------------- +Thu Mar 11 17:57:38 CET 2010 - max@suse.de + +- Fix build for SLES9 + ------------------------------------------------------------------- Tue Feb 9 14:42:29 CET 2010 - max@suse.de diff --git a/postgresql.spec b/postgresql.spec index 201b37e..dd4237a 100644 --- a/postgresql.spec +++ b/postgresql.spec @@ -15,13 +15,13 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - - Name: postgresql -BuildRequires: bison flex gettext-devel krb5-devel libxslt-devel +BuildRequires: bison flex gettext-devel BuildRequires: openldap2-devel openssl-devel pam-devel readline-devel zlib-devel BuildRequires: ncurses-devel +%if 0%{?suse_version} > 910 +BuildRequires: krb5-devel libxslt-devel +%endif Summary: Basic Clients and Utilities for PostgreSQL Version: 8.4.2 Release: 3 @@ -164,7 +164,7 @@ which will interact with a PostgreSQL server. %patch1 %patch2 # apply the following patch only on SLE10 -%if %suse_version == 1010 +%if 0%{?suse_version} == 1010 %patch3 -p1 %endif @@ -189,17 +189,19 @@ export CFLAGS="%optflags $SP" --without-tcl \ --with-openssl \ --with-pam \ - --with-krb5 \ - --with-gssapi \ --with-ldap \ +%if 0%{?suse_version} > 910 + --with-gssapi \ --with-libxml \ --with-libxslt \ + --with-krb5 \ +%endif --with-system-tzdata=/usr/share/zoneinfo make %{?jobs:-j%jobs} all make %{?jobs:-j%jobs} -C contrib all # %ifnarch %arm - +%if 0%{?suse_version} > 910 %check # # Run the regression tests. @@ -213,6 +215,7 @@ make check || { exit 1 } %endif +%endif %install make DESTDIR=%buildroot install @@ -233,7 +236,7 @@ do done install -m 755 %{SOURCE9} %buildroot/etc/init.d/postgresql install -m 644 %{SOURCE8} %buildroot/var/adm/fillup-templates/sysconfig.postgresql -%if 0%suse_version > 1020 +%if 0%{?suse_version} > 1020 install -m 644 %SOURCE16 %buildroot/etc/sysconfig/SuSEfirewall2.d/services/postgresql %endif ln -s ../../etc/init.d/postgresql %buildroot/usr/sbin/rcpostgresql @@ -367,7 +370,7 @@ rm -f %my_provides %defattr(-,root,root) %config /etc/init.d/postgresql %config /var/adm/fillup-templates/sysconfig.postgresql -%if 0%suse_version > 1020 +%if 0%{?suse_version} > 1020 %config /etc/sysconfig/SuSEfirewall2.d/services/postgresql %endif %_sbindir/rcpostgresql diff --git a/ready b/ready deleted file mode 100644 index 473a0f4..0000000 From 5d086a6ea5fac2f66584de33f96178a8712385105d972e06d521489f5b21b327 Mon Sep 17 00:00:00 2001 From: Reinhard Max Date: Tue, 16 Mar 2010 14:28:32 +0000 Subject: [PATCH 2/6] Version 8.4.3 OBS-URL: https://build.opensuse.org/package/show/server:database:postgresql/postgresql?expand=0&rev=29 --- postgresql-8.4.2.tar.bz2 | 3 --- postgresql-8.4.3.tar.bz2 | 3 +++ postgresql.changes | 5 +++++ postgresql.spec | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) delete mode 100644 postgresql-8.4.2.tar.bz2 create mode 100644 postgresql-8.4.3.tar.bz2 diff --git a/postgresql-8.4.2.tar.bz2 b/postgresql-8.4.2.tar.bz2 deleted file mode 100644 index 733e434..0000000 --- a/postgresql-8.4.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:adb3c5c90396195d76e986f835c2bd0e0dad438f91f4dc2b62048caf6d9869f2 -size 13600699 diff --git a/postgresql-8.4.3.tar.bz2 b/postgresql-8.4.3.tar.bz2 new file mode 100644 index 0000000..f2337dd --- /dev/null +++ b/postgresql-8.4.3.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:050c3e8324b453715e819456638fc1561351b33c8011b7cb63db98bbc2061564 +size 13645257 diff --git a/postgresql.changes b/postgresql.changes index b05c444..dfe705f 100644 --- a/postgresql.changes +++ b/postgresql.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Mar 16 15:27:42 CET 2010 - max@suse.de + +- Security and bugfix release 8.4.3. + ------------------------------------------------------------------- Thu Mar 11 18:23:38 CET 2010 - max@suse.de diff --git a/postgresql.spec b/postgresql.spec index dd4237a..69d8d88 100644 --- a/postgresql.spec +++ b/postgresql.spec @@ -23,7 +23,7 @@ BuildRequires: ncurses-devel BuildRequires: krb5-devel libxslt-devel %endif Summary: Basic Clients and Utilities for PostgreSQL -Version: 8.4.2 +Version: 8.4.3 Release: 3 %define pg_minor_version %(echo %version | cut -f1-2 -d.) License: BSD3c(or similar) From 6e4ce0b05b7fa9a3ebe0b82ccbd417f04cbeb1edff620425a4c584b331a70dd7 Mon Sep 17 00:00:00 2001 From: Reinhard Max Date: Tue, 13 Apr 2010 08:02:28 +0000 Subject: [PATCH 3/6] Bump version number in postgresql-pl.spec OBS-URL: https://build.opensuse.org/package/show/server:database:postgresql/postgresql?expand=0&rev=30 --- postgresql-pl.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/postgresql-pl.spec b/postgresql-pl.spec index db06e78..f631fe4 100644 --- a/postgresql-pl.spec +++ b/postgresql-pl.spec @@ -24,7 +24,7 @@ BuildRequires: krb5-devel libxslt-devel %endif BuildRequires: python-devel tcl-devel Summary: The PL/Tcl, PL/Perl, and PL/Python Procedural Languages for PostgreSQL -Version: 8.4.2 +Version: 8.4.3 Release: 3 %define pg_minor_version %(echo %version | cut -f1-2 -d.) License: BSD3c(or similar) From 0700e24a7c444dba31fc6dbf4a38d4b116060971c28f0d86ec75e71e73631120 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Sat, 24 Apr 2010 10:51:01 +0000 Subject: [PATCH 4/6] Accepting request 38094 from home:elvigia:branches:server:database:postgresql Copy from home:elvigia:branches:server:database:postgresql/postgresql via accept of submit request 38094 revision 2. Request was accepted with message: Reviewed ok OBS-URL: https://build.opensuse.org/request/show/38094 OBS-URL: https://build.opensuse.org/package/show/server:database:postgresql/postgresql?expand=0&rev=31 --- postgresql.changes | 5 +++++ postgresql.spec | 1 + 2 files changed, 6 insertions(+) diff --git a/postgresql.changes b/postgresql.changes index dfe705f..96ac329 100644 --- a/postgresql.changes +++ b/postgresql.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Apr 17 15:21:18 UTC 2010 - crrodriguez@opensuse.org + +- Should Require timezone package + ------------------------------------------------------------------- Tue Mar 16 15:27:42 CET 2010 - max@suse.de diff --git a/postgresql.spec b/postgresql.spec index 69d8d88..fca5664 100644 --- a/postgresql.spec +++ b/postgresql.spec @@ -45,6 +45,7 @@ PreReq: postgresql-libs = %pg_minor_version Url: http://www.postgresql.org/ Provides: postgresql = %pg_minor_version BuildRoot: %{_tmppath}/%{name}-%{version}-build +Requires: timezone %description PostgreSQL is an advanced object-relational database management system From 9851ff5d4ef059152e0596cdcf2ba2e8f712e40dcff76d92ed3f0a949eb0a01a Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Sat, 24 Apr 2010 15:15:20 +0000 Subject: [PATCH 5/6] Accepting request 38684 from server:database:postgresql checked in (request 38684) OBS-URL: https://build.opensuse.org/request/show/38684 OBS-URL: https://build.opensuse.org/package/show/server:database:postgresql/postgresql?expand=0&rev=32 --- postgresql-8.4.2.tar.bz2 | 3 +++ postgresql-8.4.3.tar.bz2 | 3 --- postgresql-pl.changes | 5 ----- postgresql-pl.spec | 15 ++++++--------- postgresql.changes | 20 -------------------- postgresql.spec | 26 +++++++++++--------------- 6 files changed, 20 insertions(+), 52 deletions(-) create mode 100644 postgresql-8.4.2.tar.bz2 delete mode 100644 postgresql-8.4.3.tar.bz2 diff --git a/postgresql-8.4.2.tar.bz2 b/postgresql-8.4.2.tar.bz2 new file mode 100644 index 0000000..733e434 --- /dev/null +++ b/postgresql-8.4.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:adb3c5c90396195d76e986f835c2bd0e0dad438f91f4dc2b62048caf6d9869f2 +size 13600699 diff --git a/postgresql-8.4.3.tar.bz2 b/postgresql-8.4.3.tar.bz2 deleted file mode 100644 index f2337dd..0000000 --- a/postgresql-8.4.3.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:050c3e8324b453715e819456638fc1561351b33c8011b7cb63db98bbc2061564 -size 13645257 diff --git a/postgresql-pl.changes b/postgresql-pl.changes index 0e11d4b..be13a3e 100644 --- a/postgresql-pl.changes +++ b/postgresql-pl.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Thu Mar 11 18:24:28 CET 2010 - max@suse.de - -- Disable GSSAPI, XML, kerberos and make check in OBS for SLES9. - ------------------------------------------------------------------- Tue Feb 9 14:11:37 CET 2010 - max@suse.de diff --git a/postgresql-pl.spec b/postgresql-pl.spec index f631fe4..ff3cc9a 100644 --- a/postgresql-pl.spec +++ b/postgresql-pl.spec @@ -15,16 +15,15 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + + Name: postgresql-pl -BuildRequires: bison flex gettext-devel -BuildRequires: openldap2-devel openssl-devel pam-devel readline-devel zlib-devel +BuildRequires: bison flex gettext-devel krb5-devel libxml2-devel libxslt-devel +BuildRequires: openldap2-devel openssl-devel pam-devel readline-devel BuildRequires: ncurses-devel -%if 0%{?suse_version} > 910 -BuildRequires: krb5-devel libxslt-devel -%endif BuildRequires: python-devel tcl-devel Summary: The PL/Tcl, PL/Perl, and PL/Python Procedural Languages for PostgreSQL -Version: 8.4.3 +Version: 8.4.2 Release: 3 %define pg_minor_version %(echo %version | cut -f1-2 -d.) License: BSD3c(or similar) @@ -134,13 +133,11 @@ export CFLAGS="%optflags $SP" --with-tclconfig=%_libdir \ --with-openssl \ --with-pam \ - --with-ldap \ -%if 0%{?suse_version} > 910 --with-krb5 \ --with-gssapi \ + --with-ldap \ --with-libxml \ --with-libxslt \ -%endif --with-system-tzdata=/usr/share/zoneinfo # fmgroids.h is needed for plperl make -C src/backend ../../src/include/utils/fmgroids.h diff --git a/postgresql.changes b/postgresql.changes index 96ac329..9621385 100644 --- a/postgresql.changes +++ b/postgresql.changes @@ -1,23 +1,3 @@ -------------------------------------------------------------------- -Sat Apr 17 15:21:18 UTC 2010 - crrodriguez@opensuse.org - -- Should Require timezone package - -------------------------------------------------------------------- -Tue Mar 16 15:27:42 CET 2010 - max@suse.de - -- Security and bugfix release 8.4.3. - -------------------------------------------------------------------- -Thu Mar 11 18:23:38 CET 2010 - max@suse.de - -- Disable GSSAPI, XML, kerberos and make check in OBS for SLES9. - -------------------------------------------------------------------- -Thu Mar 11 17:57:38 CET 2010 - max@suse.de - -- Fix build for SLES9 - ------------------------------------------------------------------- Tue Feb 9 14:42:29 CET 2010 - max@suse.de diff --git a/postgresql.spec b/postgresql.spec index fca5664..201b37e 100644 --- a/postgresql.spec +++ b/postgresql.spec @@ -15,15 +15,15 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # +# norootforbuild + + Name: postgresql -BuildRequires: bison flex gettext-devel +BuildRequires: bison flex gettext-devel krb5-devel libxslt-devel BuildRequires: openldap2-devel openssl-devel pam-devel readline-devel zlib-devel BuildRequires: ncurses-devel -%if 0%{?suse_version} > 910 -BuildRequires: krb5-devel libxslt-devel -%endif Summary: Basic Clients and Utilities for PostgreSQL -Version: 8.4.3 +Version: 8.4.2 Release: 3 %define pg_minor_version %(echo %version | cut -f1-2 -d.) License: BSD3c(or similar) @@ -45,7 +45,6 @@ PreReq: postgresql-libs = %pg_minor_version Url: http://www.postgresql.org/ Provides: postgresql = %pg_minor_version BuildRoot: %{_tmppath}/%{name}-%{version}-build -Requires: timezone %description PostgreSQL is an advanced object-relational database management system @@ -165,7 +164,7 @@ which will interact with a PostgreSQL server. %patch1 %patch2 # apply the following patch only on SLE10 -%if 0%{?suse_version} == 1010 +%if %suse_version == 1010 %patch3 -p1 %endif @@ -190,19 +189,17 @@ export CFLAGS="%optflags $SP" --without-tcl \ --with-openssl \ --with-pam \ - --with-ldap \ -%if 0%{?suse_version} > 910 + --with-krb5 \ --with-gssapi \ + --with-ldap \ --with-libxml \ --with-libxslt \ - --with-krb5 \ -%endif --with-system-tzdata=/usr/share/zoneinfo make %{?jobs:-j%jobs} all make %{?jobs:-j%jobs} -C contrib all # %ifnarch %arm -%if 0%{?suse_version} > 910 + %check # # Run the regression tests. @@ -216,7 +213,6 @@ make check || { exit 1 } %endif -%endif %install make DESTDIR=%buildroot install @@ -237,7 +233,7 @@ do done install -m 755 %{SOURCE9} %buildroot/etc/init.d/postgresql install -m 644 %{SOURCE8} %buildroot/var/adm/fillup-templates/sysconfig.postgresql -%if 0%{?suse_version} > 1020 +%if 0%suse_version > 1020 install -m 644 %SOURCE16 %buildroot/etc/sysconfig/SuSEfirewall2.d/services/postgresql %endif ln -s ../../etc/init.d/postgresql %buildroot/usr/sbin/rcpostgresql @@ -371,7 +367,7 @@ rm -f %my_provides %defattr(-,root,root) %config /etc/init.d/postgresql %config /var/adm/fillup-templates/sysconfig.postgresql -%if 0%{?suse_version} > 1020 +%if 0%suse_version > 1020 %config /etc/sysconfig/SuSEfirewall2.d/services/postgresql %endif %_sbindir/rcpostgresql From d02e22137bd146ae7ed31f9a986cff221fae20b99decd509991622879cd888f2 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Sat, 24 Apr 2010 15:15:22 +0000 Subject: [PATCH 6/6] Updating link to change in openSUSE:Factory/postgresql revision 20.0 OBS-URL: https://build.opensuse.org/package/show/server:database:postgresql/postgresql?expand=0&rev=a8492ef7fa6516cf0b574e9a73f6443a --- postgresql-8.4.2.tar.bz2 | 3 --- postgresql-8.4.3.tar.bz2 | 3 +++ postgresql-pl.changes | 5 +++++ postgresql-pl.spec | 17 +++++++++++------ postgresql.changes | 20 ++++++++++++++++++++ postgresql.spec | 27 +++++++++++++++++---------- 6 files changed, 56 insertions(+), 19 deletions(-) delete mode 100644 postgresql-8.4.2.tar.bz2 create mode 100644 postgresql-8.4.3.tar.bz2 diff --git a/postgresql-8.4.2.tar.bz2 b/postgresql-8.4.2.tar.bz2 deleted file mode 100644 index 733e434..0000000 --- a/postgresql-8.4.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:adb3c5c90396195d76e986f835c2bd0e0dad438f91f4dc2b62048caf6d9869f2 -size 13600699 diff --git a/postgresql-8.4.3.tar.bz2 b/postgresql-8.4.3.tar.bz2 new file mode 100644 index 0000000..f2337dd --- /dev/null +++ b/postgresql-8.4.3.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:050c3e8324b453715e819456638fc1561351b33c8011b7cb63db98bbc2061564 +size 13645257 diff --git a/postgresql-pl.changes b/postgresql-pl.changes index be13a3e..0e11d4b 100644 --- a/postgresql-pl.changes +++ b/postgresql-pl.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Mar 11 18:24:28 CET 2010 - max@suse.de + +- Disable GSSAPI, XML, kerberos and make check in OBS for SLES9. + ------------------------------------------------------------------- Tue Feb 9 14:11:37 CET 2010 - max@suse.de diff --git a/postgresql-pl.spec b/postgresql-pl.spec index ff3cc9a..c677f59 100644 --- a/postgresql-pl.spec +++ b/postgresql-pl.spec @@ -1,5 +1,5 @@ # -# spec file for package postgresql-pl (Version 8.4.2) +# spec file for package postgresql-pl (Version 8.4.3) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,13 +18,16 @@ Name: postgresql-pl -BuildRequires: bison flex gettext-devel krb5-devel libxml2-devel libxslt-devel -BuildRequires: openldap2-devel openssl-devel pam-devel readline-devel +BuildRequires: bison flex gettext-devel +BuildRequires: openldap2-devel openssl-devel pam-devel readline-devel zlib-devel BuildRequires: ncurses-devel +%if 0%{?suse_version} > 910 +BuildRequires: krb5-devel libxslt-devel +%endif BuildRequires: python-devel tcl-devel Summary: The PL/Tcl, PL/Perl, and PL/Python Procedural Languages for PostgreSQL -Version: 8.4.2 -Release: 3 +Version: 8.4.3 +Release: 1 %define pg_minor_version %(echo %version | cut -f1-2 -d.) License: BSD3c(or similar) Group: Productivity/Databases/Servers @@ -133,11 +136,13 @@ export CFLAGS="%optflags $SP" --with-tclconfig=%_libdir \ --with-openssl \ --with-pam \ + --with-ldap \ +%if 0%{?suse_version} > 910 --with-krb5 \ --with-gssapi \ - --with-ldap \ --with-libxml \ --with-libxslt \ +%endif --with-system-tzdata=/usr/share/zoneinfo # fmgroids.h is needed for plperl make -C src/backend ../../src/include/utils/fmgroids.h diff --git a/postgresql.changes b/postgresql.changes index 9621385..96ac329 100644 --- a/postgresql.changes +++ b/postgresql.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Sat Apr 17 15:21:18 UTC 2010 - crrodriguez@opensuse.org + +- Should Require timezone package + +------------------------------------------------------------------- +Tue Mar 16 15:27:42 CET 2010 - max@suse.de + +- Security and bugfix release 8.4.3. + +------------------------------------------------------------------- +Thu Mar 11 18:23:38 CET 2010 - max@suse.de + +- Disable GSSAPI, XML, kerberos and make check in OBS for SLES9. + +------------------------------------------------------------------- +Thu Mar 11 17:57:38 CET 2010 - max@suse.de + +- Fix build for SLES9 + ------------------------------------------------------------------- Tue Feb 9 14:42:29 CET 2010 - max@suse.de diff --git a/postgresql.spec b/postgresql.spec index 201b37e..8eba03e 100644 --- a/postgresql.spec +++ b/postgresql.spec @@ -1,5 +1,5 @@ # -# spec file for package postgresql (Version 8.4.2) +# spec file for package postgresql (Version 8.4.3) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -15,16 +15,18 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Name: postgresql -BuildRequires: bison flex gettext-devel krb5-devel libxslt-devel +BuildRequires: bison flex gettext-devel BuildRequires: openldap2-devel openssl-devel pam-devel readline-devel zlib-devel BuildRequires: ncurses-devel +%if 0%{?suse_version} > 910 +BuildRequires: krb5-devel libxslt-devel +%endif Summary: Basic Clients and Utilities for PostgreSQL -Version: 8.4.2 -Release: 3 +Version: 8.4.3 +Release: 1 %define pg_minor_version %(echo %version | cut -f1-2 -d.) License: BSD3c(or similar) Group: Productivity/Databases/Tools @@ -45,6 +47,7 @@ PreReq: postgresql-libs = %pg_minor_version Url: http://www.postgresql.org/ Provides: postgresql = %pg_minor_version BuildRoot: %{_tmppath}/%{name}-%{version}-build +Requires: timezone %description PostgreSQL is an advanced object-relational database management system @@ -164,7 +167,7 @@ which will interact with a PostgreSQL server. %patch1 %patch2 # apply the following patch only on SLE10 -%if %suse_version == 1010 +%if 0%{?suse_version} == 1010 %patch3 -p1 %endif @@ -189,16 +192,19 @@ export CFLAGS="%optflags $SP" --without-tcl \ --with-openssl \ --with-pam \ - --with-krb5 \ - --with-gssapi \ --with-ldap \ +%if 0%{?suse_version} > 910 + --with-gssapi \ --with-libxml \ --with-libxslt \ + --with-krb5 \ +%endif --with-system-tzdata=/usr/share/zoneinfo make %{?jobs:-j%jobs} all make %{?jobs:-j%jobs} -C contrib all # %ifnarch %arm +%if 0%{?suse_version} > 910 %check # @@ -213,6 +219,7 @@ make check || { exit 1 } %endif +%endif %install make DESTDIR=%buildroot install @@ -233,7 +240,7 @@ do done install -m 755 %{SOURCE9} %buildroot/etc/init.d/postgresql install -m 644 %{SOURCE8} %buildroot/var/adm/fillup-templates/sysconfig.postgresql -%if 0%suse_version > 1020 +%if 0%{?suse_version} > 1020 install -m 644 %SOURCE16 %buildroot/etc/sysconfig/SuSEfirewall2.d/services/postgresql %endif ln -s ../../etc/init.d/postgresql %buildroot/usr/sbin/rcpostgresql @@ -367,7 +374,7 @@ rm -f %my_provides %defattr(-,root,root) %config /etc/init.d/postgresql %config /var/adm/fillup-templates/sysconfig.postgresql -%if 0%suse_version > 1020 +%if 0%{?suse_version} > 1020 %config /etc/sysconfig/SuSEfirewall2.d/services/postgresql %endif %_sbindir/rcpostgresql