- SERVICE=syslog replaced with SERVICE_syslog=y in upstart job

- %upstart_post and %upstart_postun macro definitions removed (now in
  rpm-build-macros)
- Release: 2

Changed files:
    postgresql.spec -> 1.471
    postgresql.upstart -> 1.3

diff --git a/postgresql.spec b/postgresql.spec
index 3e84de9e6c21017f0707180f04bcbee8a01288d7..24a4f9548fb3197996f96ad5d3185f504d466520 100644 (file)
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -29,7 +29,7 @@ Summary(uk.UTF-8):    PostgreSQL - система керування базами 
 Summary(zh_CN.UTF-8):  PostgreSQL 客户端程序和库文件
 Name:          postgresql
 Version:       %{mver}.4
-Release:       1
+Release:       2
 License:       BSD
 Group:         Applications/Databases
 Source0:       ftp://ftp.postgresql.org/pub/source/v%{version}/%{name}-%{version}.tar.bz2
@@ -107,25 +107,6 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 # tsearch2 - old module for compatibility only
 %define        contrib_modules adminpack auto_explain btree_gin btree_gist chkpass citext cube dblink dict_int dict_xsyn earthdistance fuzzystrmatch hstore intagg intarray isn lo ltree oid2name pageinspect passwordcheck pg_archivecleanup pg_buffercache pg_freespacemap pg_standby pg_stat_statements pg_trgm pg_upgrade pg_upgrade_support pgbench pgcrypto pgrowlocks pgstattuple pldebugger seg sslinfo tablefunc unaccent uuid-ossp vacuumlo xml2
 
-## to be moved to rpm-build-macros
-## TODO: handle RPM_SKIP_AUTO_RESTART
-
-# migrate from init script to upstart job
-%define        upstart_post() \
-       if [ -f /var/lock/subsys/"%1" ] ; then \
-               /sbin/service --no-upstart "%1" stop \
-               /sbin/service "%1" start \
-       else \
-               /sbin/service "%1" try-restart \
-       fi
-
-# restart the job after upgrade or migrate to init script on removal
-%define        upstart_postun() \
-       if [ -x /sbin/initctl ] && /sbin/initctl status "%1" 2>/dev/null | grep -q 'running' ; then \
-               /sbin/initctl stop "%1" 2>/dev/null \
-               [ -f "/etc/rc.d/init.d/%1" -o -f "/etc/init/%1.conf" ] && /sbin/service "%1" start \
-       fi
-
 %description
 PostgreSQL Data Base Management System (formerly known as Postgres,
 then as Postgres95).
@@ -354,6 +335,7 @@ Summary(pl.UTF-8):  Opis zadania Upstart dla serwera PostgreSQL
 Group:         Daemons
 Requires:      %{name} = %{version}-%{release}
 Requires:      upstart >= 0.6
+Conflicts:     syslog-ng < 3.2.4-1
 
 %description upstart
 Upstart job description for PostgreSQL.

diff --git a/postgresql.upstart b/postgresql.upstart
index ba4a58e3484c3f07e65c4abbbc734c003d08ddab..e61e63be4cfeb4462e1a17b01869e0d8b23c75a4 100644 (file)
--- a/postgresql.upstart
+++ b/postgresql.upstart
@@ -1,6 +1,6 @@
 description "Starts PostgreSQL instances for all configured clusters"
 
-start on started SERVICE=syslog
+start on started SERVICE_syslog=y
 
 env PG_DB_CLUSTERS