From 74edc60107ec25973d52e3330bc215a8640a13bcda22fb4af9e14569b178ecc5 Mon Sep 17 00:00:00 2001 From: Reinhard Max Date: Wed, 18 Feb 2015 15:29:10 +0000 Subject: [PATCH 1/4] - Bump version and defaultpackage to 9.4. OBS-URL: https://build.opensuse.org/package/show/server:database:postgresql/postgresql?expand=0&rev=77 --- postgresql.changes | 5 +++++ postgresql.spec | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/postgresql.changes b/postgresql.changes index ccf4b14..5e34658 100644 --- a/postgresql.changes +++ b/postgresql.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Feb 18 15:28:45 UTC 2015 - max@suse.com + +- Bump version and defaultpackage to 9.4. + ------------------------------------------------------------------- Tue Sep 17 11:44:19 UTC 2013 - max@suse.com diff --git a/postgresql.spec b/postgresql.spec index 6926925..411b80d 100644 --- a/postgresql.spec +++ b/postgresql.spec @@ -15,13 +15,13 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -%define defaultpackage postgresql93 +%define defaultpackage postgresql94 Name: postgresql Summary: Basic Clients and Utilities for PostgreSQL License: PostgreSQL Group: Productivity/Databases/Tools -Version: 9.3 +Version: 9.4 Release: 0 Url: http://www.postgresql.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build From 03694168dce23145cfaced884504a944e56ff2048046cc8f891573a307812bc0 Mon Sep 17 00:00:00 2001 From: Reinhard Max Date: Mon, 28 Sep 2015 15:09:38 +0000 Subject: [PATCH 2/4] - Move ~postgres/.bash_profile to postgresql-server to avoid a file conflict between the versioned server packages. OBS-URL: https://build.opensuse.org/package/show/server:database:postgresql/postgresql?expand=0&rev=78 --- postgresql.changes | 6 ++++++ postgresql.spec | 6 +++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/postgresql.changes b/postgresql.changes index 5e34658..1de86f0 100644 --- a/postgresql.changes +++ b/postgresql.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Sep 28 15:04:31 UTC 2015 - max@suse.com + +- Move ~postgres/.bash_profile to postgresql-server to avoid a + file conflict between the versioned server packages. + ------------------------------------------------------------------- Wed Feb 18 15:28:45 UTC 2015 - max@suse.com diff --git a/postgresql.spec b/postgresql.spec index 411b80d..4b2fc49 100644 --- a/postgresql.spec +++ b/postgresql.spec @@ -27,6 +27,8 @@ Url: http://www.postgresql.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: %defaultpackage BuildArch: noarch +Source: postgresql-bashprofile + %description PostgreSQL is an advanced object-relational database management system @@ -155,7 +157,8 @@ and triggers. echo "This is a dummy package to provide a dependency on the default PostgreSQL version." > README %install -# Nothing to do here +sed 's,@LIBDIR@,%_libdir,g' %{SOURCE} > \ + %buildroot/var/lib/pgsql/.bash_profile %files %defattr(-,root,root,-) @@ -164,6 +167,7 @@ echo "This is a dummy package to provide a dependency on the default PostgreSQL %files server %defattr(-,root,root,-) %doc README +%attr(640,postgres,postgres) %config(noreplace) /var/lib/pgsql/.bash_profile %files docs %defattr(-,root,root,-) From 2aa0a9657ed86e3d0fb2e279bc955175f7bdf1947b55f822783cb43520b597ff Mon Sep 17 00:00:00 2001 From: Reinhard Max Date: Wed, 30 Sep 2015 07:30:44 +0000 Subject: [PATCH 3/4] OBS-URL: https://build.opensuse.org/package/show/server:database:postgresql/postgresql?expand=0&rev=79 --- postgresql-bashprofile | 6 ++++++ postgresql.spec | 5 +++-- 2 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 postgresql-bashprofile diff --git a/postgresql-bashprofile b/postgresql-bashprofile new file mode 100644 index 0000000..289318f --- /dev/null +++ b/postgresql-bashprofile @@ -0,0 +1,6 @@ + +# Get PGDATA from /etc/sysconfig/postgresql +if test -f /etc/sysconfig/postgresql; then + eval eval $(sed -n '/^POSTGRES_DATADIR=/s//PGDATA=/p' /etc/sysconfig/postgresql) + export PGDATA +fi diff --git a/postgresql.spec b/postgresql.spec index 4b2fc49..1fd1142 100644 --- a/postgresql.spec +++ b/postgresql.spec @@ -157,6 +157,7 @@ and triggers. echo "This is a dummy package to provide a dependency on the default PostgreSQL version." > README %install +mkdir -p %buildroot/var/lib/pgsql/ sed 's,@LIBDIR@,%_libdir,g' %{SOURCE} > \ %buildroot/var/lib/pgsql/.bash_profile @@ -165,8 +166,8 @@ sed 's,@LIBDIR@,%_libdir,g' %{SOURCE} > \ %doc README %files server -%defattr(-,root,root,-) -%doc README +%attr(-,root,root,-) README +%attr(750, postgres, postgres) %dir /var/lib/pgsql %attr(640,postgres,postgres) %config(noreplace) /var/lib/pgsql/.bash_profile %files docs From c4e89e511920b1f690a363d2ad3ae03dcb6387d1104dfe28cd1765d1810f34ac Mon Sep 17 00:00:00 2001 From: Reinhard Max Date: Wed, 30 Sep 2015 08:07:39 +0000 Subject: [PATCH 4/4] OBS-URL: https://build.opensuse.org/package/show/server:database:postgresql/postgresql?expand=0&rev=80 --- postgresql.spec | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/postgresql.spec b/postgresql.spec index 1fd1142..e9ee585 100644 --- a/postgresql.spec +++ b/postgresql.spec @@ -27,7 +27,7 @@ Url: http://www.postgresql.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: %defaultpackage BuildArch: noarch -Source: postgresql-bashprofile +Source0: postgresql-bashprofile %description @@ -158,7 +158,7 @@ echo "This is a dummy package to provide a dependency on the default PostgreSQL %install mkdir -p %buildroot/var/lib/pgsql/ -sed 's,@LIBDIR@,%_libdir,g' %{SOURCE} > \ +sed 's,@LIBDIR@,%_libdir,g' %{SOURCE0} > \ %buildroot/var/lib/pgsql/.bash_profile %files @@ -166,8 +166,9 @@ sed 's,@LIBDIR@,%_libdir,g' %{SOURCE} > \ %doc README %files server -%attr(-,root,root,-) README -%attr(750, postgres, postgres) %dir /var/lib/pgsql +%defattr(-,root,root,-) +%doc README +%attr(750,postgres,postgres) %dir /var/lib/pgsql %attr(640,postgres,postgres) %config(noreplace) /var/lib/pgsql/.bash_profile %files docs