From 3289ce365f37473549d085ee5d4661f15a109c728846711c96696157f903ea78 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Mon, 15 Sep 2008 10:24:56 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/sysvinit?expand=0&rev=25 --- sysvinit.changes | 5 +++++ sysvinit.spec | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/sysvinit.changes b/sysvinit.changes index 0ab7c00..5b3272b 100644 --- a/sysvinit.changes +++ b/sysvinit.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Sep 15 12:23:36 CEST 2008 - ro@suse.de + +- add detection for OBS build environment + ------------------------------------------------------------------- Wed Sep 3 11:09:34 CEST 2008 - hare@suse.de diff --git a/sysvinit.spec b/sysvinit.spec index c8ddbb7..56179dd 100644 --- a/sysvinit.spec +++ b/sysvinit.spec @@ -30,7 +30,7 @@ Group: System/Base PreReq: coreutils AutoReqProv: on Version: 2.86 -Release: 176 +Release: 182 Summary: SysV-Style init BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: libselinux-devel libsepol-devel @@ -208,7 +208,7 @@ popd if test ! -p dev/blog ; then mknod -m 0640 dev/blog p fi -if test -x /sbin/telinit -a -p /dev/initctl -a -f /proc/1/exe -a -d /proc/1/root ; then +if test -x /sbin/telinit -a -p /dev/initctl -a -f /proc/1/exe -a -d /proc/1/root -a ! -d /.build ; then if test $(stat -Lc '%%D-%%i' /) = $(stat -Lc '%%D-%%i' /proc/1/root) ; then /sbin/telinit u fi @@ -315,6 +315,8 @@ rm -rf ${RPM_BUILD_ROOT} %doc %{_mandir}/man8/startpar.8.gz %changelog +* Mon Sep 15 2008 ro@suse.de +- add detection for OBS build environment * Wed Sep 03 2008 hare@suse.de - Call mkinitrd_setup during %%post and %%postun (bnc#413709) * Mon Aug 25 2008 prusnak@suse.cz