pool/postgresql
SHA256
11
0
Fork 1
Code Issues Pull Requests Activity

Correct provides/obsoletes in postgresql-libs

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/server:database:postgresql/postgresql?expand=0&rev=52
This commit is contained in:
Reinhard Max
2011-03-04 15:03:49 +00:00
committed by Git OBS Bridge
parent 2a13f43e70
commit 262b6d62e1
6 changed files with 28 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
postgresql-libs.changes
View File

@@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Mar 4 15:02:11 UTC 2011 - max@novell.com
- Fix the fix of the fix for the successors of postgresql-libs.
-------------------------------------------------------------------
Mon Feb 21 01:09:08 CET 2011 - ro@suse.de

27
postgresql-libs.spec
View File

@@ -1,5 +1,5 @@
#
# spec file for package postgresql-libs
# spec file for package postgresql
#
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -15,8 +15,6 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
Name: postgresql-libs
%define _name postgresql
%define libpq libpq5
@@ -28,7 +26,7 @@ BuildRequires: krb5-devel libxslt-devel
BuildRequires: openldap2-devel openssl-devel
Summary: Basic Clients and Utilities for PostgreSQL
Version: 9.0.3
Release: 3
Release: 2
%define pg_minor_version %(echo %version | sed -r 's/^([0-9]+\\.[0-9]+).*/\\1/')
License: BSD3c(or similar)
Group: Productivity/Databases/Tools
@@ -50,7 +48,6 @@ Patch4: postgresql-plperl.patch
Url: http://www.postgresql.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Provides: postgresql = %pg_minor_version
%description
PostgreSQL is an advanced object-relational database management system
that supports an extended subset of the SQL standard, including
@@ -64,13 +61,11 @@ HTML documentation for PostgreSQL can be found in the postgresql-docs
package.
%package -n %libpq
License: BSD3c(or similar)
Summary: Shared Libraries Required for PostgreSQL Clients
Group: Productivity/Databases/Clients
Obsoletes: postgresql-libs
Provides: postgresql-libs
Provides: postgresql-libs = %version
Obsoletes: postgresql-libs < %version
# bug437293
%ifarch ppc64
Obsoletes: postgresql-libs-64bit
@@ -86,16 +81,10 @@ This package provides the client library that most PostgreSQL client
program or language bindings are using.
%package -n %libecpg
License: BSD3c(or similar)
Summary: Shared Libraries Required for PostgreSQL Clients
Group: Productivity/Databases/Clients
Obsoletes: postgresql-libs
# bug437293
%ifarch ppc64
Obsoletes: postgresql-libs-64bit
%endif
Provides: postgresql-libs:%_libdir/libecpg.so.6
%description -n %libecpg
PostgreSQL is an advanced object-relational database management system
@@ -107,8 +96,6 @@ This package provides the runtime library of the embedded SQL C
preprocessor for PostgreSQL.
%package -n %_name-devel
License: BSD3c(or similar)
Summary: PostgreSQL development header files and libraries
Group: Productivity/Databases/Tools
@@ -190,13 +177,9 @@ rm -f $(ls %buildroot/%_libdir/*.a | grep -F -v libpgport.a)
%find_lang ecpglib6-%{pg_minor_version} %libecpg.lang
%find_lang ecpg-%{pg_minor_version} %_name-devel.lang
%find_lang pg_config-%{pg_minor_version} %_name-devel.lang
%post -n %libpq -p /sbin/ldconfig
%postun -n %libpq -p /sbin/ldconfig
%post -n %libecpg -p /sbin/ldconfig
%postun -n %libecpg -p /sbin/ldconfig
%clean

3
postgresql-mkspecfiles
View File

@@ -5,7 +5,8 @@ sed '/IF_LIBS/,/FI_LIBS/d
/FI_POSTGRES/d
' postgresql.spec.in > postgresql.spec
sed '/IF_POSTGRES/,/FI_POSTGRES/d
sed '/^Name: /s/$/-libs/
/IF_POSTGRES/,/FI_POSTGRES/d
/IF_LIBS/d
/FI_LIBS/d
' postgresql.spec.in > postgresql-libs.spec

5
postgresql.changes
View File

@@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Mar 4 15:02:11 UTC 2011 - max@novell.com
- Fix the fix of the fix for the successors of postgresql-libs.
-------------------------------------------------------------------
Mon Feb 21 01:09:08 CET 2011 - ro@suse.de

29
postgresql.spec
View File

@@ -15,10 +15,8 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
Name: postgresql
BuildRequires: gettext-devel ncurses-devel readline-devel zlib-devel
BuildRequires: gettext-devel zlib-devel ncurses-devel readline-devel
BuildRequires: pam-devel python-devel tcl-devel
%if 0%{?suse_version} >= 1110
BuildRequires: fdupes
@@ -35,7 +33,7 @@ BuildRequires: krb5-devel libxslt-devel
BuildRequires: openldap2-devel openssl-devel
Summary: Basic Clients and Utilities for PostgreSQL
Version: 9.0.3
Release: 3
Release: 2
%define pg_minor_version %(echo %version | sed -r 's/^([0-9]+\\.[0-9]+).*/\\1/')
License: BSD3c(or similar)
Group: Productivity/Databases/Tools
@@ -57,7 +55,6 @@ Patch4: postgresql-plperl.patch
Url: http://www.postgresql.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Provides: postgresql = %pg_minor_version
%description
PostgreSQL is an advanced object-relational database management system
that supports an extended subset of the SQL standard, including
@@ -71,13 +68,11 @@ HTML documentation for PostgreSQL can be found in the postgresql-docs
package.
%package -n %libpq
License: BSD3c(or similar)
Summary: Shared Libraries Required for PostgreSQL Clients
Group: Productivity/Databases/Clients
Obsoletes: postgresql-libs
Provides: postgresql-libs
Provides: postgresql-libs = %version
Obsoletes: postgresql-libs < %version
# bug437293
%ifarch ppc64
Obsoletes: postgresql-libs-64bit
@@ -93,16 +88,10 @@ This package provides the client library that most PostgreSQL client
program or language bindings are using.
%package -n %libecpg
License: BSD3c(or similar)
Summary: Shared Libraries Required for PostgreSQL Clients
Group: Productivity/Databases/Clients
Obsoletes: postgresql-libs
# bug437293
%ifarch ppc64
Obsoletes: postgresql-libs-64bit
%endif
Provides: postgresql-libs:%_libdir/libecpg.so.6
%description -n %libecpg
PostgreSQL is an advanced object-relational database management system
@@ -173,8 +162,6 @@ PostgreSQL server, which will in turn allow you to create and maintain
PostgreSQL databases.
%package -n %_name-devel
License: BSD3c(or similar)
Summary: PostgreSQL development header files and libraries
Group: Productivity/Databases/Tools
@@ -391,13 +378,9 @@ exit 0
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 || :
%post -n %libpq -p /sbin/ldconfig
%postun -n %libpq -p /sbin/ldconfig
%post -n %libecpg -p /sbin/ldconfig
%postun -n %libecpg -p /sbin/ldconfig
%clean
@@ -511,7 +494,6 @@ rm -f %my_provides
%_libdir/postgresql/plpython*.so
%if %buildall
%files -n %libpq -f %libpq.lang
%defattr(-,root,root)
%_libdir/libpq.so.*
@@ -536,5 +518,4 @@ rm -f %my_provides
%_datadir/postgresql/pg_service.conf.sample
%endif
%changelog

19
postgresql.spec.in
View File

@@ -1,7 +1,7 @@
#
# spec file for package postgresql (Version 8.4.3)
# spec file for package postgresql
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -15,8 +15,8 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
IF_POSTGRES
Name: postgresql
IF_POSTGRES
BuildRequires: gettext-devel zlib-devel ncurses-devel readline-devel
BuildRequires: pam-devel python-devel tcl-devel
%if 0%{?suse_version} >= 1110
@@ -25,9 +25,6 @@ BuildRequires: fdupes
%define fdupes #
%endif
FI_POSTGRES
IF_LIBS
Name: postgresql-libs
FI_LIBS
%define _name postgresql
%define libpq libpq5
%define libecpg libecpg6
@@ -76,7 +73,8 @@ package.
License: BSD3c(or similar)
Summary: Shared Libraries Required for PostgreSQL Clients
Group: Productivity/Databases/Clients
Obsoletes: postgresql-libs
Provides: postgresql-libs = %version
Obsoletes: postgresql-libs < %version
# bug437293
%ifarch ppc64
Obsoletes: postgresql-libs-64bit
@@ -95,12 +93,7 @@ program or language bindings are using.
License: BSD3c(or similar)
Summary: Shared Libraries Required for PostgreSQL Clients
Group: Productivity/Databases/Clients
Obsoletes: postgresql-libs
Provides: postgresql-libs
# bug437293
%ifarch ppc64
Obsoletes: postgresql-libs-64bit
%endif
Provides: postgresql-libs:%_libdir/libecpg.so.6
%description -n %libecpg
PostgreSQL is an advanced object-relational database management system