Author: jajcus Date: Wed Jun 15 12:16:11 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- 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
---- Files affected:
packages/postgresql:
postgresql.spec (1.470 -> 1.471) , postgresql.upstart (1.2 -> 1.3)
---- Diffs:
================================================================
Index: packages/postgresql/postgresql.spec
diff -u packages/postgresql/postgresql.spec:1.470
packages/postgresql/postgresql.spec:1.471
--- packages/postgresql/postgresql.spec:1.470 Thu Apr 21 18:39:18 2011
+++ packages/postgresql/postgresql.spec Wed Jun 15 14:16:06 2011
@@ -30,7 +30,7 @@
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
@@ -108,25 +108,6 @@
# 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).
@@ -355,6 +336,7 @@
Group: Daemons
Requires: %{name} = %{version}-%{release}
Requires: upstart >= 0.6
+Conflicts: syslog-ng < 3.2.4-1
%description upstart
Upstart job description for PostgreSQL.
@@ -1268,6 +1250,12 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.471 2011/06/15 12:16:06 jajcus
+- 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
+
Revision 1.470 2011/04/21 16:39:18 arekm
- up to 9.0.4
================================================================
Index: packages/postgresql/postgresql.upstart
diff -u packages/postgresql/postgresql.upstart:1.2
packages/postgresql/postgresql.upstart:1.3
--- packages/postgresql/postgresql.upstart:1.2 Fri May 21 08:15:35 2010
+++ packages/postgresql/postgresql.upstart Wed Jun 15 14:16:06 2011
@@ -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
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/postgresql/postgresql.spec?r1=1.470&r2=1.471&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/postgresql/postgresql.upstart?r1=1.2&r2=1.3&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
