packages: rpm-build-macros/disable-systemd.patch, rpm-build-macros/rpm-buil...

[glen]

Author: glen                         Date: Tue Mar 13 16:15:16 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- disable systemd in service generator as well

---- Files affected:
packages/rpm-build-macros:
   disable-systemd.patch (1.2 -> 1.3) , rpm-build-macros.spec (1.325 -> 1.326) 

---- Diffs:

================================================================
Index: packages/rpm-build-macros/disable-systemd.patch
diff -u packages/rpm-build-macros/disable-systemd.patch:1.2 packages/rpm-build-macros/disable-systemd.patch:1.3
--- packages/rpm-build-macros/disable-systemd.patch:1.2	Tue Mar 13 17:11:54 2012
+++ packages/rpm-build-macros/disable-systemd.patch	Tue Mar 13 17:15:11 2012
@@ -91,3 +91,43 @@
  
  %systemdunitdir /lib/systemd/system
  %systemdtmpfilesdir /usr/lib/tmpfiles.d
+--- ./service_generator.sh	1 Feb 2012 17:46:43 -0000	1.13
++++ ./service_generator.sh	4 Jan 2012 05:09:03 -0000	1.11
+@@ -19,8 +19,7 @@
+ # common part
+ service_body() {
+ 	cat <<-EOF
+-		if [ ! -x /bin/systemd_booted ] || ! /bin/systemd_booted; then
+-			if [ -f /var/lock/subsys/$service ]; then
++		if [ -f /var/lock/subsys/$service ]; then
+ 	EOF
+ 	if [ "$noop" = 1 ]; then
+ 		echo :
+@@ -32,12 +31,11 @@
+ 
+ 	if [ "$quiet" != 1 ]; then
+ 		cat <<-EOF
+-			else
+-				echo 'Run "/sbin/service $service start" to start $desc.'
++		else
++			echo 'Run "/sbin/service $service start" to start $desc.'
+ 		EOF
+ 	fi
+ 	cat <<-EOF
+-			fi
+ 		fi
+ 	EOF
+ }
+@@ -61,10 +59,8 @@
+ 	echo 'else'
+ 		# service restart was disabled, tell them to restart it
+ 	cat <<-EOF
+-		if [ ! -x /bin/systemd_booted ] || ! /bin/systemd_booted; then
+-			if [ -f /var/lock/subsys/$service ]; then
+-				echo 'Run "/sbin/service $service restart" to restart $desc.'
+-			fi
++		if [ -f /var/lock/subsys/$service ]; then
++			echo 'Run "/sbin/service $service restart" to restart $desc.'
+ 		fi
+ 	EOF
+ 	echo 'fi'

================================================================
Index: packages/rpm-build-macros/rpm-build-macros.spec
diff -u packages/rpm-build-macros/rpm-build-macros.spec:1.325 packages/rpm-build-macros/rpm-build-macros.spec:1.326
--- packages/rpm-build-macros/rpm-build-macros.spec:1.325	Tue Mar 13 17:04:07 2012
+++ packages/rpm-build-macros/rpm-build-macros.spec	Tue Mar 13 17:15:11 2012
@@ -48,8 +48,8 @@
 
 %prep
 %setup -qcT
-cp %{SOURCE0} .
-#%patch0 -p1
+cp -p %{SOURCE0} .
+cp -p %{SOURCE1} .
 
 %if "%{pld_release}" == "ac"
 %{__sed} -i -e '/libtoolize --copy --force --install/s/ --install//' rpm.macros
@@ -72,7 +72,7 @@
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_usrlibrpm},/etc/shrc.d}
 cp -a rpm.macros $RPM_BUILD_ROOT%{_usrlibrpm}/macros.build
-install -p %{SOURCE1} $RPM_BUILD_ROOT%{_usrlibrpm}/service_generator.sh
+install -p service_generator.sh $RPM_BUILD_ROOT%{_usrlibrpm}
 install -p %{SOURCE2} $RPM_BUILD_ROOT/etc/shrc.d/rpm-build.sh
 install -p %{SOURCE3} $RPM_BUILD_ROOT%{_usrlibrpm}/find-lang.sh
 install -p %{SOURCE4} $RPM_BUILD_ROOT%{_usrlibrpm}
@@ -94,6 +94,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.326  2012/03/13 16:15:11  glen
+- disable systemd in service generator as well
+
 Revision 1.325  2012/03/13 16:04:07  glen
 - disable systemd for ac
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm-build-macros/disable-systemd.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm-build-macros/rpm-build-macros.spec?r1=1.325&r2=1.326&f=u