- updated to 3.04

[packages/SysVinit.git] / SysVinit.spec

diff --git a/SysVinit.spec b/SysVinit.spec
index 6925a69edd7d1de5304b90de7f8101a0de49b789..ca1500a86f20ff33fae7fca70e9aaa0e205eced8 100644 (file)
--- a/SysVinit.spec
+++ b/SysVinit.spec
@@ -12,24 +12,23 @@ Summary(ru.UTF-8):  Программы, управляющие базовыми 
 Summary(tr.UTF-8):     System V başlatma programı
 Summary(uk.UTF-8):     Програми, що керують базовими системними процесами
 Name:          SysVinit
-Version:       2.88
-Release:       16
+Version:       3.04
+Release:       1
 License:       GPL v2+
 Group:         Base
-Source0:       http://download.savannah.gnu.org/releases/sysvinit/sysvinit-%{version}dsf.tar.bz2
-# Source0-md5: 6eda8a97b86e0a6f59dabbf25202aa6f
+Source0:       http://download.savannah.gnu.org/releases/sysvinit/sysvinit-%{version}.tar.xz
+# Source0-md5: 9a00e5f15dd2f038f10feee50677ebff
 Source1:       sysvinit.logrotate
 Source2:       http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/sysvinit-non-english-man-pages.tar.bz2
-Source3:       crypttab.5
 # Source2-md5: 9ae8a63a4685368fae19707f95475cca
+Source3:       crypttab.5
 Patch0:                sysvinit-paths.patch
 Patch1:                sysvinit-bequiet.patch
 Patch2:                sysvinit-wtmp.patch
-Patch3:                sysvinit-man.patch
+
 Patch4:                sysvinit-halt.patch
 Patch5:                sysvinit-autofsck.patch
-Patch6:                sysvinit-pidof.patch
-Patch7:                sysvinit-killall5.patch
+
 Patch8:                sysvinit-nopowerstates-single.patch
 Patch9:                sysvinit-lastlog.patch
 Patch10:       sysvinit-alt-fixes.patch
@@ -51,8 +50,8 @@ Requires:     login
 Requires:      mingetty
 Requires:      util-linux >= 2.24-1
 Provides:      group(utmp)
-Provides:      virtual(init-daemon)
-Obsoletes:     virtual(init-daemon)
+Provides:      virtual-init-daemon
+Obsoletes:     virtual-init-daemon
 Obsoletes:     vserver-SysVinit
 Conflicts:     rc-scripts < 0.4.9-1
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -127,15 +126,14 @@ This package contains various tools used for process management.
 Ten pakiet zawiera różne narzędzia do zarządzania procesami.
 
 %prep
-%setup -q -n sysvinit-%{version}dsf
+%setup -q -n sysvinit-%{version}
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
+
 %patch4 -p1
 %patch5 -p1
-%patch6 -p1
-%patch7 -p1
+
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
@@ -147,7 +145,7 @@ Ten pakiet zawiera różne narzędzia do zarządzania procesami.
        %{?with_selinux:WITH_SELINUX=yes} \
        CC="%{__cc}" \
        LCRYPT="-lcrypt" \
-       CFLAGS="%{rpmcflags}" \
+       CFLAGS="%{rpmcflags} %{rpmcppflags}" \
        LDFLAGS="%{rpmldflags}"
 
 %install
@@ -184,17 +182,25 @@ cp -a man/intl/* $RPM_BUILD_ROOT%{_mandir}
 cp %{SOURCE3} $RPM_BUILD_ROOT%{_mandir}/man5
 
 # in util-linux
-%{__rm} $RPM_BUILD_ROOT{/bin/mountpoint,%{_mandir}/man1/mountpoint.1*}
 %{__rm} $RPM_BUILD_ROOT{/sbin/sulogin,%{_mandir}/man8/sulogin.8*,%{_mandir}/*/man8/sulogin.8*}
 %{__rm} $RPM_BUILD_ROOT{/usr/bin/utmpdump,%{_mandir}/man1/utmpdump.1*}
 %{__rm} $RPM_BUILD_ROOT{/usr/bin/{last,lastb,mesg},%{_mandir}/man1/{last,lastb,mesg}.1*,%{_mandir}/*/man1/{last,lastb,mesg}.1*}
 
-# fools rpm-build-macros, don't package this file
-:>$RPM_BUILD_ROOT%{_mandir}/man1/utmpdump.1
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+# not in trigger because wtmpx is %%ghost, and %%ghost-ed files
+# are removed when they'are uninstalled
+%pretrans
+if [ -e /var/log/wtmpx ]; then
+       # wtmp always takes precedence, it's safe to remove wtmpx
+       if [ -s /var/log/wtmp ]; then
+               %{__rm} -f /var/log/wtmpx
+       else
+               %{__mv} -f /var/log/wtmpx /var/log/wtmp
+       fi
+fi
+
 %pre
 %groupadd -g 22 utmp
 
@@ -207,12 +213,18 @@ chmod 600 %{_sysconfdir}/ioctl.save
 chmod 640 /var/log/btmp
 chmod 640 /var/log/faillog
 chmod 664 /var/log/lastlog
-if [ -p /dev/initctl ]; then
+if [ -p /run/initctl ]; then
        %{_sbindir}/telinit u || :
 fi
 
+%triggerun -- SysVinit < 2.94-1
+# it will be needed once until reboot happens
+if [ -p /dev/initctl -a ! -e /run/initctl ]; then
+       ln -s /dev/initctl /run/initctl || :
+fi
+
 %triggerpostun -- glibc
-if [ -p /dev/initctl ]; then
+if [ -p /run/initctl ]; then
        %{_sbindir}/telinit u || :
 fi
 
@@ -221,23 +233,14 @@ if [ "$1" = "0" ]; then
        %groupremove utmp
 fi
 
-%triggerpostun -- SysVinit < 2.88-16
-if [ -e /var/log/wtmpx ]; then
-       # wtmp always takes precedence, it's safe to remove wtmpx
-       if [ -s /var/log/wtmp ]; then
-               rm -f /var/log/wtmpx
-       else
-               mv /var/log/wtmpx /var/log/wtmp
-       fi
-fi
-
 %files
 %defattr(644,root,root,755)
-%doc COPYRIGHT README doc/{Changelog,Propaganda} src/initscript.sample
+%doc COPYRIGHT README doc/{Changelog,Propaganda} doc/initscript.sample
 
 %attr(755,root,root) %{_sbindir}/bootlogd
 %attr(755,root,root) %{_sbindir}/halt
 %attr(755,root,root) %{_sbindir}/init
+%attr(755,root,root) %{_sbindir}/logsave
 %attr(755,root,root) %{_sbindir}/poweroff
 %attr(755,root,root) %{_sbindir}/reboot
 %attr(755,root,root) %{_sbindir}/runlevel
@@ -251,11 +254,13 @@ fi
 %attr(664,root,utmp) %ghost /var/log/wtmp
 
 %{_mandir}/man5/crypttab.5*
+%{_mandir}/man5/initctl.5*
 %{_mandir}/man5/inittab.5*
 %{_mandir}/man5/initscript.5*
 %{_mandir}/man8/bootlogd.8*
 %{_mandir}/man8/halt.8*
 %{_mandir}/man8/init.8*
+%{_mandir}/man8/logsave.8*
 %{_mandir}/man8/poweroff.8
 %{_mandir}/man8/reboot.8
 %{_mandir}/man8/runlevel.8*
@@ -328,9 +333,11 @@ fi
 %attr(755,root,root) %{_sbindir}/killall5
 %attr(755,root,root) %{_sbindir}/lastlog
 %attr(755,root,root) %{_sbindir}/pidof
+%attr(2755,root,tty) %{_bindir}/readbootlog
 %attr(2755,root,tty) %{_bindir}/wall
 %attr(640,root,root) %ghost /var/log/faillog
 %attr(664,root,utmp) %ghost /var/log/lastlog
+%{_mandir}/man1/readbootlog.1*
 %{_mandir}/man1/wall.1*
 %{_mandir}/man8/killall5.8*
 %{_mandir}/man8/lastlog.8*