[packages/rpm/rpm-4_5] disable systemd params in rpm.sysconfig

[glen]

commit 0ad2bbc266e74dc730b9b554ecc8f368f97312dc
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Thu Nov 8 06:56:28 2012 +0200

    disable systemd params in rpm.sysconfig

 rpm-disable-features.patch | 18 ++++++++++++++++++
 rpm.spec                   |  3 ++-
 2 files changed, 20 insertions(+), 1 deletion(-)
---
diff --git a/rpm.spec b/rpm.spec
index 36e77e9..d80297d 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -714,6 +714,7 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze
 
 %prep
 %setup -q
+cp -p %{SOURCE15} .
 %patch1000 -p1
 #%patch0 -p1
 %patch2 -p1
@@ -1070,7 +1071,7 @@ install -p scripts/php.{prov,req}	$RPM_BUILD_ROOT%{_rpmlibdir}
 cp -p %{SOURCE21} $RPM_BUILD_ROOT%{_rpmlibdir}/php.req.php
 install -p %{SOURCE5} $RPM_BUILD_ROOT%{_rpmlibdir}/hrmib-cache
 install -p %{SOURCE18} $RPM_BUILD_ROOT%{_bindir}/banner.sh
-cp -a %{SOURCE15} $RPM_BUILD_ROOT/etc/sysconfig/rpm
+cp -p %{name}.sysconfig $RPM_BUILD_ROOT/etc/sysconfig/rpm
 
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/rpm/sysinfo
 touch $RPM_BUILD_ROOT%{_sysconfdir}/rpm/sysinfo/Conflictname
diff --git a/rpm-disable-features.patch b/rpm-disable-features.patch
index f839135..d74a500 100644
--- a/rpm-disable-features.patch
+++ b/rpm-disable-features.patch
@@ -40,3 +40,21 @@
  
  #-----------------------------------------------------------------
  # CFLAGS and LDFLAGS used to build
+--- rpm/rpm.sysconfig~	2012-11-08 05:23:51.082114980 +0200
++++ rpm/rpm.sysconfig	2012-11-08 06:49:38.238855609 +0200
+@@ -12,15 +12,3 @@
+ # You can also disable this per service, if service supports it from
+ # /etc/sysconfig/SERVICE
+ #RPM_SKIP_AUTO_RESTART=yes
+-
+-# Should package upgrades enable SysV service?
+-# You don't want to disable this unless you're planning to fully
+-# migrate to systemd or want serviceless system.
+-RPM_ENABLE_SYSV_SERVICE=yes
+-
+-# 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
+-# upgraded services. Newly installed packages will still have
+-# systemd services enabled.
+-RPM_ENABLE_SYSTEMD_SERVICE=yes
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rpm.git/commitdiff/0bf9b92babb4a840f2dce859db6bd93e457f31cb