From 15d0832b00692f02029a6359a71cd26095e42646f49182b483978aaeec561e3f Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Fri, 29 Aug 2008 23:24:42 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/postgresql?expand=0&rev=6

---
 postgresql-init    |  2 +-
 postgresql-pl.spec | 13 ++++++++++---
 postgresql.changes |  5 +++++
 postgresql.spec    | 23 ++++++++++++++++-------
 4 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/postgresql-init b/postgresql-init
index 38c43ae..285bb08 100644
--- a/postgresql-init
+++ b/postgresql-init
@@ -30,7 +30,7 @@
 ### BEGIN INIT INFO
 # Provides:       postgresql
 # Required-Start: $network $remote_fs
-# Required-Stop:
+# Required-Stop: $network $remote_fs
 # Default-Start:  3 5
 # Default-Stop:   
 # Description:    Start the PostgreSQL master daemon
diff --git a/postgresql-pl.spec b/postgresql-pl.spec
index 85aee09..debe1bc 100644
--- a/postgresql-pl.spec
+++ b/postgresql-pl.spec
@@ -2,9 +2,16 @@
 # spec file for package postgresql-pl (Version 8.3.1)
 #
 # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
 #
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
@@ -17,7 +24,7 @@ BuildRequires:  ncurses-devel
 BuildRequires:  python-devel tcl-devel
 Summary:        The PL/Tcl, PL/Perl, and PL/Python Procedural Languages for PostgreSQL
 Version:        8.3.1
-Release:        4
+Release:        6
 %define pg_minor_version %(echo %version | cut -f1-2 -d.)
 License:        BSD 3-Clause
 Group:          Productivity/Databases/Servers
diff --git a/postgresql.changes b/postgresql.changes
index cee1ff9..e03b065 100644
--- a/postgresql.changes
+++ b/postgresql.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Aug 28 23:23:58 CEST 2008 - cthiel@suse.de
+
+- fix init script
+
 -------------------------------------------------------------------
 Mon May 19 18:31:54 CEST 2008 - schwab@suse.de
 
diff --git a/postgresql.spec b/postgresql.spec
index 094966c..e45e6e4 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -2,9 +2,16 @@
 # spec file for package postgresql (Version 8.3.1)
 #
 # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
 #
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
@@ -16,7 +23,7 @@ BuildRequires:  openldap2-devel openssl-devel pam-devel readline-devel zlib-deve
 BuildRequires:  ncurses-devel
 Summary:        Basic Clients and Utilities for PostgreSQL
 Version:        8.3.1
-Release:        11
+Release:        35
 %define pg_minor_version %(echo %version | cut -f1-2 -d.)
 License:        BSD 3-Clause
 Group:          Productivity/Databases/Tools
@@ -292,15 +299,15 @@ cp -a %SOURCE3 %buildroot%_docdir/postgresql/README.SuSE.en
 %postun libs -p /sbin/ldconfig
 
 %post server
-%{?fillup_and_insserv:%fillup_and_insserv -s postgresql START_POSTGRES}
+%fillup_and_insserv
 
 %postun server
-%{?restart_on_update:%restart_on_update postgresql}
-%{?insserv_cleanup:%insserv_cleanup}
+%restart_on_update postgresql
+%insserv_cleanup
 exit 0
 
 %preun server
-%{?stop_on_removal:%stop_on_removal postgresql}
+%stop_on_removal postgresql
 exit 0
 
 %pre server
@@ -446,6 +453,8 @@ rm -f %my_provides
 %doc %_mandir/man1/pg_config.1*
 
 %changelog
+* Fri Aug 29 2008 cthiel@suse.de
+- fix init script
 * Mon May 19 2008 schwab@suse.de
 - Fix broken configure check.
 * Fri May 09 2008 aj@suse.de