packages (rpm-4_5): rpm/rpm.spec, rpm/rpm.sysconfig - rel 59 - "enable" is ...

[baggins]

Author: baggins                      Date: Thu Jan 26 22:54:05 2012 GMT
Module: packages                      Tag: rpm-4_5
---- Log message:
- rel 59
- "enable" is better than "activate" (more consistent with systemd/sysv tools)

---- Files affected:
packages/rpm:
   rpm.spec (1.837.2.42.2.49.2.114 -> 1.837.2.42.2.49.2.115) , rpm.sysconfig (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: packages/rpm/rpm.spec
diff -u packages/rpm/rpm.spec:1.837.2.42.2.49.2.114 packages/rpm/rpm.spec:1.837.2.42.2.49.2.115
--- packages/rpm/rpm.spec:1.837.2.42.2.49.2.114	Thu Jan 26 22:43:03 2012
+++ packages/rpm/rpm.spec	Thu Jan 26 23:54:00 2012
@@ -58,7 +58,7 @@
 Summary(uk.UTF-8):	Менеджер пакетів від RPM
 Name:		rpm
 Version:	4.5
-Release:	58
+Release:	59
 License:	LGPL
 Group:		Base
 Source0:	%{name}-%{version}.tar.gz
@@ -1493,6 +1493,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.837.2.42.2.49.2.115  2012/01/26 22:54:00  baggins
+- rel 59
+- "enable" is better than "activate" (more consistent with systemd/sysv tools)
+
 Revision 1.837.2.42.2.49.2.114  2012/01/26 21:43:03  baggins
 - really fix am stupidity
 

================================================================
Index: packages/rpm/rpm.sysconfig
diff -u packages/rpm/rpm.sysconfig:1.5 packages/rpm/rpm.sysconfig:1.6
--- packages/rpm/rpm.sysconfig:1.5	Thu Jan 26 19:55:04 2012
+++ packages/rpm/rpm.sysconfig	Thu Jan 26 23:54:00 2012
@@ -14,13 +14,13 @@
 # /etc/sysconfig/SERVICE
 #RPM_SKIP_AUTO_RESTART=yes
 
-# Should package upgrades activate SysV service?
+# Should package upgrades enable SysV service?
 # You don't want to disable this unless you're planning to fully
 # migrate to systemd or want serviceles system.
-RPM_ACTIVATE_SYSV_SERVICE=yes
+RPM_ENABLE_SYSV_SERVICE=yes
 
-# Should package upgrades activate systemd service?
+# Should package upgrades enable systemd service?
 # This means migrating init scripts from SysV to systemd.
 # If you disable this, systemd units will not be enabled for newly
-# installed/upgraded services
-RPM_ACTIVATE_SYSTEMD_SERVICE=yes
+# installed/upgraded services.
+RPM_ENABLE_SYSTEMD_SERVICE=yes
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm/rpm.spec?r1=1.837.2.42.2.49.2.114&r2=1.837.2.42.2.49.2.115&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm/rpm.sysconfig?r1=1.5&r2=1.6&f=u