Hello community, here is the log from the commit of package postgresql-init for openSUSE:Factory checked in at 2016-05-08 10:40:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/postgresql-init (Old) and /work/SRC/openSUSE:Factory/.postgresql-init.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "postgresql-init" Changes: -------- --- /work/SRC/openSUSE:Factory/postgresql-init/postgresql-init.changes 2016-02-16 09:27:32.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.postgresql-init.new/postgresql-init.changes 2016-05-08 10:40:39.000000000 +0200 @@ -1,0 +2,13 @@ +Mon Apr 25 18:31:25 UTC 2016 - mrueckert@suse.de + +- fix building on sle11: + - guard all systemd related parts with build conditional + - do not own fwdir on sle11 + +------------------------------------------------------------------- +Mon Feb 15 10:11:02 UTC 2016 - max@suse.com + +- Increase the default timeout for pg_ctl from 60 to 600 seconds + and make it configurable (bsc#966285). + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ postgresql-init.spec ++++++ --- /var/tmp/diff_new_pack.pt9GsX/_old 2016-05-08 10:40:40.000000000 +0200 +++ /var/tmp/diff_new_pack.pt9GsX/_new 2016-05-08 10:40:40.000000000 +0200 @@ -15,6 +15,11 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # +%if 0%{?suse_version} >= 1300 +%bcond_without systemd +%else +%bcond_with systemd +%endif Url: http://www.postgresql.org/ Summary: Init script and other infrastructure for PostgreSQL @@ -29,11 +34,15 @@ Source2: postgresql-firewall Source3: postgresql-tmpfiles.conf BuildRequires: pwdutils +%if %{with systemd} +BuildRequires: pkgconfig(systemd) BuildRequires: systemd %{?systemd_requires} +%else +Requires(postun): %insserv_prereq +%endif Requires(pre): pwdutils Requires(post): %fillup_prereq -Requires(postun): %insserv_prereq BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -65,8 +74,10 @@ install -m755 -d %buildroot%fwdir install -m644 %{S:2} %buildroot%fwdir/%fwname +%if %{with systemd} install -m755 -d %buildroot/%_tmpfilesdir install -m644 %{S:3} %buildroot%_tmpfilesdir/postgresql.conf +%endif install -m755 -d %buildroot/usr/sbin ln -sf /etc/init.d/postgresql %buildroot/usr/sbin/rcpostgresql @@ -78,23 +89,31 @@ %post %fillup_only -n postgresql -systemd-tmpfiles --create postgresql.conf +%if %{with systemd} +/usr/bin/systemd-tmpfiles --create %_tmpfilesdir/postgresql.conf test -x /bin/systemctl && /bin/systemctl daemon-reload || : +%endif %preun %stop_on_removal postgresql %postun %insserv_cleanup +%if %{with systemd} test -x /bin/systemctl && /bin/systemctl daemon-reload || : +%endif %files %defattr(-,root,root,-) %config /etc/init.d/postgresql +%if 0%{?suse_version} > 1110 %dir %fwdir +%endif %config %fwdir/%fwname /var/adm/fillup-templates/sysconfig.postgresql /usr/sbin/rcpostgresql +%if %{with systemd} %_tmpfilesdir/postgresql.conf +%endif %changelog ++++++ postgresql-init ++++++ --- /var/tmp/diff_new_pack.pt9GsX/_old 2016-05-08 10:40:40.000000000 +0200 +++ /var/tmp/diff_new_pack.pt9GsX/_new 2016-05-08 10:40:40.000000000 +0200 @@ -84,7 +84,7 @@ VERSION=$($POSTGRES --version|awk '{print $NF}') LOGFILE=$DATADIR/postmaster.log pg_ctl () { - CMD="$BINDIR/pg_ctl $@" + CMD="$BINDIR/pg_ctl ${POSTGRES_TIMEOUT:+-t $POSTGRES_TIMEOUT} $@" su - postgres -c "$CMD" } ++++++ postgresql-sysconfig ++++++ --- /var/tmp/diff_new_pack.pt9GsX/_old 2016-05-08 10:40:40.000000000 +0200 +++ /var/tmp/diff_new_pack.pt9GsX/_new 2016-05-08 10:40:40.000000000 +0200 @@ -22,6 +22,18 @@ # POSTGRES_OPTIONS="" + +## Path: Applications/PostgreSQL +## Description: The PostgreSQL Database System +## Type: string() +## Default: "600" +## ServiceRestart: postgresql +# +# This value controls how many seconds the pg_ctl helper program waits +# for the startup or shutdown of the PostgreSQL server to complete. +# +POSTGRES_TIMEOUT="600" + ## Path: Applications/PostgreSQL ## Description: The PostgreSQL Database System ## Type: string()