- disable systemd in service generator as well

Changed files:
    disable-systemd.patch -> 1.3
    rpm-build-macros.spec -> 1.326

diff --git a/disable-systemd.patch b/disable-systemd.patch
index 0dec30c7643ab5c0c222d90f3bd58f3f9eab049e..208c2ab99213b616831d056d1fe936994501c852 100644 (file)
--- a/disable-systemd.patch
+++ b/disable-systemd.patch
@@ -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'

diff --git a/rpm-build-macros.spec b/rpm-build-macros.spec
index f7ffc57dd61a70f0d9d4cf6f6c32cdcdeaf23870..ac9aa198f603400ec06d4233b9ed0b3091d3a8c7 100644 (file)
--- a/rpm-build-macros.spec
+++ b/rpm-build-macros.spec
@@ -47,8 +47,8 @@ Ten pakiet zawiera makra rpm-a do budowania pakietów dla Linuksa PLD.
 
 %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
@@ -71,7 +71,7 @@ fi
 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}