diff --git a/sysvinit.changes b/sysvinit.changes index 89142b8..99b1dd1 100644 --- a/sysvinit.changes +++ b/sysvinit.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Jun 7 10:30:04 UTC 2013 - werner@suse.de + +- Skip binaries now part of util-linux + ------------------------------------------------------------------- Wed Apr 24 08:49:40 UTC 2013 - werner@suse.de diff --git a/sysvinit.spec b/sysvinit.spec index c0919e8..2cb68e6 100644 --- a/sysvinit.spec +++ b/sysvinit.spec @@ -16,6 +16,11 @@ # +%bcond_with util_linux +%if 0%{suse_version} < 1300 +%global with_util_linux 1 +%endif + Name: sysvinit %define PDVER 2.0.2 %define KPVER 2.21 @@ -32,6 +37,7 @@ BuildRequires: audit-devel BuildRequires: libselinux-devel BuildRequires: libsepol-devel BuildRequires: pam-devel +#!BuildIgnore: sysvinit-tools Requires(post): coreutils grep mkinitrd Requires(postun): mkinitrd Url: http://savannah.nongnu.org/projects/sysvinit/ @@ -231,6 +237,14 @@ popd rm -f ${RPM_BUILD_ROOT}/sbin/detectups %endif chmod 444 ${RPM_BUILD_ROOT}%{_mandir}/man?/* +%if ! %{with util_linux} + rm -vf ${RPM_BUILD_ROOT}/bin/mountpoint + rm -vf ${RPM_BUILD_ROOT}/usr/bin/utmpdump + rm -vf ${RPM_BUILD_ROOT}/sbin/sulogin + rm -vf ${RPM_BUILD_ROOT}%{_mandir}/man1/mountpoint.1* + rm -vf ${RPM_BUILD_ROOT}%{_mandir}/man1/utmpdump.1* + rm -vf ${RPM_BUILD_ROOT}%{_mandir}/man8/sulogin.8* +%endif %preun tools %stop_on_removal powerd @@ -303,13 +317,16 @@ fi %doc doc/powerd %endif %config /etc/pam.d/init +%if %{with util_linux} +/sbin/sulogin /bin/mountpoint +/usr/bin/utmpdump +%endif /bin/pidof /bin/usleep /bin/fsync /usr/bin/last /usr/bin/lastb -/usr/bin/utmpdump /sbin/blogger /sbin/blogd /sbin/fstab-decode @@ -332,15 +349,17 @@ fi /sbin/mkill /sbin/startproc /sbin/start_daemon -/sbin/sulogin +%if %{with util_linux} +%doc %{_mandir}/man1/mountpoint.1.gz +%doc %{_mandir}/man1/utmpdump.1.gz +%doc %{_mandir}/man8/sulogin.8.gz +%endif %doc %{_mandir}/man1/last.1.gz %doc %{_mandir}/man1/lastb.1.gz %doc %{_mandir}/man1/usleep.1.gz %doc %{_mandir}/man1/fsync.1.gz # /usr/include/libblogger.h # /usr/lib/libblogger.a -%doc %{_mandir}/man1/mountpoint.1.gz -%doc %{_mandir}/man1/utmpdump.1.gz %doc %{_mandir}/man8/blogger.8.gz %doc %{_mandir}/man8/blogd.8.gz %doc %{_mandir}/man8/fstab-decode.8.gz @@ -359,7 +378,6 @@ fi %doc %{_mandir}/man8/startproc.8.gz %doc %{_mandir}/man8/start_daemon.8.gz %doc %{_mandir}/man8/startpar.8.gz -%doc %{_mandir}/man8/sulogin.8.gz %doc %{_mandir}/man8/rvmtab.8.gz %doc %{_mandir}/man8/vhangup.8.gz %doc %{_mandir}/man8/mkill.8.gz