- drop fstab-decode man page too

[packages/rc-scripts.git] / rc-scripts.spec

diff --git a/rc-scripts.spec b/rc-scripts.spec
index e07ca9c37b0271fbbf7912b6027df6c2856b1354..5ba09bbe2459f877e7885b01ef0643b8684b6498 100644 (file)
--- a/rc-scripts.spec
+++ b/rc-scripts.spec
@@ -8,14 +8,16 @@ Summary(fr.UTF-8):    inittab et scripts /etc/rc.d
 Summary(pl.UTF-8):     inittab i skrypty startowe z katalogu /etc/rc.d
 Summary(tr.UTF-8):     inittab ve /etc/rc.d dosyaları
 Name:          rc-scripts
-Version:       0.4.5
-Release:       1
+Version:       0.4.5.1
+Release:       6
 License:       GPL v2
 Group:         Base
-#Source0:      ftp://distfiles.pld-linux.org/src/%{name}-%{version}.tar.gz
-Source0:       %{name}-%{version}.tar.gz
-# Source0-md5: 59d0e791688d3df8cb6fd52ada8351ca
+Source0:       ftp://distfiles.pld-linux.org/src/%{name}-%{version}.tar.gz
+# Source0-md5: 00d0cbd7bb54c89fed07ebce20a4a0b7
+Source1:       rc-scripts-systemd-tmpfiles.d.conf
+Source2:       rc-local.service
 URL:           http://svn.pld-linux.org/trac/svn/wiki/packages/rc-scripts
+Patch0:                %{name}-svn.patch
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: gettext-devel
@@ -37,13 +39,14 @@ Requires:   /bin/gettext
 Requires:      /bin/nice
 Requires:      /bin/ps
 Requires:      SysVinit
+Requires:      SysVinit-tools >= 2.88-1
 Requires:      blockdev
 Requires:      coreutils
 Requires:      ethtool
 %if "%{pld_release}" == "ac"
 Requires:      filesystem >= 3.0-11
 %else
-Requires:      filesystem >= 3.0-35
+Requires:      filesystem >= 4.0-1
 %endif
 Requires:      findutils
 Requires:      fsck
@@ -77,6 +80,7 @@ Conflicts:    udev-core < 1:124-3
 %endif
 Conflicts:     upstart-SysVinit < 2.86-25
 Conflicts:     wpa_supplicant < 0.6.3
+Conflicts:     lvm2 < 2.02.83
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _exec_prefix    /
@@ -112,6 +116,7 @@ programcıklar içerir.
 
 %prep
 %setup -q
+%patch0 -p0
 
 # hack, currently this results -lgcc_s not found error:
 #GLIB_LIBS="-Wl,-static `$PKG_CONFIG --libs --static glib-2.0` -Wl,-Bdynamic"
@@ -136,6 +141,10 @@ install -d $RPM_BUILD_ROOT/etc/sysconfig/hwprofiles
        DESTDIR=$RPM_BUILD_ROOT \
        %{!?with_static:ppp_watch_LDADD="$(pkg-config --libs glib-2.0)" ppp_watch_DEPENDENCIES=}
 
+# now part of SysVinit-tools
+%{__rm} $RPM_BUILD_ROOT%{_sbindir}/fstab-decode \
+       $RPM_BUILD_ROOT%{_mandir}/man8/fstab-decode.8*
+
 for i in 0 1 2 3 4 5 6; do
        install -d $RPM_BUILD_ROOT/etc/rc.d/rc$i.d
 done
@@ -179,6 +188,10 @@ done
 # make /etc/init.d symlink relative
 ln -nfs rc.d/init.d $RPM_BUILD_ROOT/etc/init.d
 
+# systemd
+install -D %{SOURCE1} $RPM_BUILD_ROOT/usr/lib/tmpfiles.d/rc-scripts.conf
+install -D %{SOURCE2} $RPM_BUILD_ROOT/lib/systemd/system/rc-local.service
+
 %if "%{pld_release}" == "ac"
 rm -rf $RPM_BUILD_ROOT/etc/init
 %endif
@@ -280,7 +293,6 @@ mv -f /etc/sysconfig/network-scripts/ifcfg-* /etc/sysconfig/interfaces
 %attr(755,root,root) %{_bindir}/usleep
 
 %attr(755,root,root) %{_sbindir}/consoletype
-%attr(755,root,root) %{_sbindir}/fstab-decode
 %attr(755,root,root) %{_sbindir}/genhostid
 %attr(755,root,root) %{_sbindir}/getkey
 %attr(755,root,root) %{_sbindir}/hwprofile
@@ -296,8 +308,12 @@ mv -f /etc/sysconfig/network-scripts/ifcfg-* /etc/sysconfig/interfaces
 %attr(755,root,root) %{_sbindir}/start-stop-daemon
 %attr(755,root,root) %{_sbindir}/tnl*
 %attr(4755,root,root) %{_sbindir}/usernetctl
+
 %attr(755,root,root) /lib/firmware/firmware-loader.sh
 
+/usr/lib/tmpfiles.d/rc-scripts.conf
+/lib/systemd/system/rc-local.service
+
 %dir /lib/rc-scripts
 %attr(755,root,root) /lib/rc-scripts/ifdown-br
 %attr(755,root,root) /lib/rc-scripts/ifdown-irda