From de0278567f501c121058fe0df0a2fdda9353e1b697947af7e933969be0f2fd48 Mon Sep 17 00:00:00 2001 From: Bruno Friedmann Date: Tue, 12 Dec 2017 15:43:28 +0000 Subject: [PATCH 1/2] Accepting request 554763 from home:bruno_friedmann:branches:server:database:postgresql - Replace references to /var/adm/fillup-templates with new %_fillupdir macro (boo#1069468) OBS-URL: https://build.opensuse.org/request/show/554763 OBS-URL: https://build.opensuse.org/package/show/server:database:postgresql/postgresql?expand=0&rev=98 --- postgresql.changes | 6 ++++++ postgresql.spec | 12 +++++++++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/postgresql.changes b/postgresql.changes index ac2fc14..cecd87b 100644 --- a/postgresql.changes +++ b/postgresql.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Dec 6 10:32:06 UTC 2017 - bruno@ioda-net.ch + +- Replace references to /var/adm/fillup-templates with new + %_fillupdir macro (boo#1069468) + ------------------------------------------------------------------- Fri Nov 24 11:24:09 UTC 2017 - mrueckert@suse.de diff --git a/postgresql.spec b/postgresql.spec index 1a059c7..c1895ff 100644 --- a/postgresql.spec +++ b/postgresql.spec @@ -17,6 +17,11 @@ %define defaultpackage postgresql10 +#Compat macro for new _fillupdir macro introduced in Nov 2017 +%if ! %{defined _fillupdir} + %define _fillupdir /var/adm/fillup-templates +%endif + %if 0%{?suse_version} >= 1300 %bcond_without systemd %else @@ -225,8 +230,8 @@ echo "This is a dummy package to provide a dependency on the default PostgreSQL mkdir -p %buildroot/var/lib/pgsql/ install -m640 %{SOURCE5} %buildroot/var/lib/pgsql/.bash_profile -install -m755 -d %buildroot/var/adm/fillup-templates -install -m644 %{S:1} %buildroot/var/adm/fillup-templates/sysconfig.postgresql +install -m755 -d %buildroot%{_fillupdir} +install -m644 %{S:1} %buildroot%{_fillupdir}/sysconfig.postgresql install -m755 -d %buildroot%fwdir install -m644 %{S:2} %buildroot%fwdir/%fwname @@ -330,7 +335,8 @@ fi %dir %fwdir %endif %config %fwdir/%fwname -/var/adm/fillup-templates/sysconfig.postgresql + +%{_fillupdir}/sysconfig.postgresql /usr/sbin/rcpostgresql %if %{with systemd} %_tmpfilesdir/postgresql.conf From 38997f090a7656e468ac3f5b95781f62621407e2e7034db26caa16f45cb9dda7 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Thu, 14 Dec 2017 11:49:04 +0000 Subject: [PATCH 2/2] Accepting request 556940 from home:darix:branches:server:database:postgresql - add provides for all the pkgconfig() provides you also find in the postgresqlXY-devel packages. then we automatically will pull postgresql-devel which in turn will pull our default postgresqlXY-devel package. (boo#1071971) OBS-URL: https://build.opensuse.org/request/show/556940 OBS-URL: https://build.opensuse.org/package/show/server:database:postgresql/postgresql?expand=0&rev=99 --- postgresql.changes | 8 ++++++++ postgresql.spec | 4 ++++ 2 files changed, 12 insertions(+) diff --git a/postgresql.changes b/postgresql.changes index cecd87b..a0bd80c 100644 --- a/postgresql.changes +++ b/postgresql.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Dec 13 18:10:54 UTC 2017 - mrueckert@suse.de + +- add provides for all the pkgconfig() provides you also find in + the postgresqlXY-devel packages. then we automatically will pull + postgresql-devel which in turn will pull our default + postgresqlXY-devel package. (boo#1071971) + ------------------------------------------------------------------- Wed Dec 6 10:32:06 UTC 2017 - bruno@ioda-net.ch diff --git a/postgresql.spec b/postgresql.spec index c1895ff..ed6ce24 100644 --- a/postgresql.spec +++ b/postgresql.spec @@ -155,6 +155,10 @@ Documentation for the modules contained in this package can be found in Summary: PostgreSQL development header files and libraries Group: Development/Libraries/C and C++ Provides: postgresql-devel-noarch = %version-%release +Provides: pkgconfig(libecpg) = %{version}-%{release} +Provides: pkgconfig(libecpg_compat) = %{version}-%{release} +Provides: pkgconfig(libpgtypes) = %{version}-%{release} +Provides: pkgconfig(libpq) = %{version}-%{release} Requires: postgresql-devel-implementation Recommends: %defaultpackage-devel