[packages/rpm-build-macros] - 1.671 - chkconfig no longer list services whose have systemd services, workaround it with plain

[baggins]

commit 10c60f81c77d8d53ed14f25171e984e7e4ce4964
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Fri Aug 16 18:31:48 2013 +0200

    - 1.671
    - chkconfig no longer list services whose have systemd services,
      workaround it with plain shell wildcard expansions

 rpm-build-macros.spec | 4 ++--
 rpm.macros            | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/rpm-build-macros.spec b/rpm-build-macros.spec
index 87e62ff..7193ae9 100644
--- a/rpm-build-macros.spec
+++ b/rpm-build-macros.spec
@@ -5,13 +5,13 @@
 %if "%{pld_release}" == "ac"
 %define	with_rpm4	1
 %endif
-%define		rpm_macros_rev	1.670
+%define		rpm_macros_rev	1.671
 %define		find_lang_rev	1.36
 Summary:	PLD Linux RPM build macros
 Summary(pl.UTF-8):	Makra do budowania pakietów RPM dla Linuksa PLD
 Name:		rpm-build-macros
 Version:	%{rpm_macros_rev}
-Release:	6
+Release:	1
 License:	GPL
 Group:		Development/Building
 Source0:	rpm.macros
diff --git a/rpm.macros b/rpm.macros
index b27b119..b0a35e2 100644
--- a/rpm.macros
+++ b/rpm.macros
@@ -2285,7 +2285,7 @@ fi; \
 want_enable_service() { \
 	[ -f /etc/sysconfig/rpm ] && . /etc/sysconfig/rpm \
 	[ ${RPM_ENABLE_SYSTEMD_SERVICE:-yes} = no ] && return 1 \
-	/sbin/chkconfig --list ${1%.service} 2>/dev/null | grep -qsv "[0-6]:on" && return 1 \
+	[ "$(echo /etc/rc.d/rc[0-6].d/S[0-9][0-9]${1%.service})" = "/etc/rc.d/rc[0-6].d/S[0-9][0-9]${1%.service}" ] && return 1 \
 	return 0 \
 }\
 	export SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog \
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rpm-build-macros.git/commitdiff/10c60f81c77d8d53ed14f25171e984e7e4ce4964