- always try to assemble RAID arrays to get them all running

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

diff --git a/rc-scripts.spec b/rc-scripts.spec
index bc18a46a6d03541a161a726d69f7f31c6bae51f6..abe17ea274b962c9552ebffae304ec4ed634d844 100644 (file)
--- a/rc-scripts.spec
+++ b/rc-scripts.spec
@@ -7,16 +7,23 @@ 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.5
-Release:       1
+Version:       0.4.12
+Release:       5
 License:       GPL v2
 Group:         Base
 Source0:       %{name}-%{version}.tar.gz
-# Source0-md5: e6f5f1d3afcdad7e0d808ffaaa8e2aba
+# Source0-md5: b52ca02678cb5f468972db06c6d032b0
 Source1:       rc-local.service
 Source2:       sys-chroots.service
 Source3:       %{name}.tmpfiles
 Patch100:      %{name}-tld.patch
+Patch101:      %{name}-no_tmpfs_root_fsck.patch
+Patch102:      %{name}-selinuxfs_mount.patch
+Patch103:      %{name}-sh_fixes.patch
+Patch104:      %{name}-net-bond.patch
+Patch105:      %{name}-net-br.patch
+Patch106:      %{name}-raid_lvm.patch
+Patch107:      %{name}-misc.patch
 URL:           http://svn.pld-linux.org/trac/svn/wiki/packages/rc-scripts
 BuildRequires: autoconf
 BuildRequires: automake
@@ -38,11 +45,11 @@ Requires:   /bin/basename
 Requires:      /bin/gettext
 Requires:      /bin/nice
 Requires:      /bin/ps
-Requires:      virtual(init-daemon)
 Requires:      SysVinit-tools >= 2.88-1
 Requires:      blockdev
 Requires:      coreutils
 Requires:      ethtool
+Requires:      virtual(init-daemon)
 Requires:      filesystem >= 4.0-1
 Requires:      findutils
 Requires:      fsck
@@ -56,11 +63,10 @@ Requires:   mktemp
 Requires:      mount >= 2.12
 Requires:      procps >= 1:3.2.6-1.1
 Requires:      psmisc >= 22.5-2
-Requires:      utempter
+Requires:      libutempter >= 1.1.6-2
 Requires:      util-linux
 Requires:      virtual(module-tools)
 Suggests:      libcgroup
-Provides:      initscripts
 Obsoletes:     initscripts
 Obsoletes:     vserver-rc-scripts
 Conflicts:     LPRng < 3.8.0-2
@@ -71,13 +77,14 @@ Conflicts:  psacct < 6.3.5-10
 Conflicts:     tzdata < 2007b-1.1
 Conflicts:     udev-core < 1:135-2
 Conflicts:     lvm2 < 2.02.83
+Conflicts:     SysVinit < 2.88-16
 Conflicts:     upstart-SysVinit < 2.86-25
 Conflicts:     wpa_supplicant < 0.6.3
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _exec_prefix    /
 %define                localedir       /etc/sysconfig/locale
-%define        _bindir         /bin
+%define                _bindir         /bin
 %define                _sbindir        /sbin
 
 %description
@@ -109,6 +116,13 @@ programcıklar içerir.
 %prep
 %setup -q
 %patch100 -p1
+%patch101 -p1
+%patch102 -p1
+%patch103 -p1
+%patch104 -p1
+%patch105 -p1
+%patch106 -p1
+%patch107 -p1
 
 # hack, currently this results in errno@@GLIBC_PRIVATE symbol in ppp-watch:
 #GLIB_LIBS="-Wl,-static `$PKG_CONFIG --libs --static glib-2.0` -Wl,-Bdynamic"
@@ -183,6 +197,9 @@ ln -s /dev/null $RPM_BUILD_ROOT%{systemdunitdir}/local.service
 install %{SOURCE2} $RPM_BUILD_ROOT%{systemdunitdir}/sys-chroots.service
 install %{SOURCE3} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/%{name}.conf
 
+# packaged into SysVinit and systemd-init (supported options differ)
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/man5/crypttab.5
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -203,7 +220,17 @@ chown root:root /var/cache/rc-scripts/msg.cache
 
 # move network interfaces description files to new location
 %triggerpostun -- initscripts
-mv -f /etc/sysconfig/network-scripts/ifcfg-* /etc/sysconfig/interfaces
+[ -d /etc/sysconfig/network-scripts ] || exit 0
+cd /etc/sysconfig/network-scripts
+for iface in ifcfg-* ; do
+       [ -f $iface ] || continue
+       if [ -f /etc/sysconfig/interfaces/$iface ]; then
+               echo "/etc/sysconfig/interfaces/$iface renamed to /etc/sysconfig/interfaces/$iface.rpmnew"
+               mv -f /etc/sysconfig/interfaces/$iface{,.rpmnew}
+       fi
+       echo "/etc/sysconfig/network-scripts/$iface moved to /etc/sysconfig/interfaces/$iface"
+       mv -f /etc/sysconfig/network-scripts/$iface /etc/sysconfig/interfaces
+done
 
 %files
 %defattr(644,root,root,755)
@@ -277,6 +304,8 @@ mv -f /etc/sysconfig/network-scripts/ifcfg-* /etc/sysconfig/interfaces
 %attr(755,root,root) %{_bindir}/ipcalc
 %attr(755,root,root) %{_bindir}/resolvesymlink
 %attr(755,root,root) %{_bindir}/run-parts
+# deprecated shell version, packaged for quick fix if something broken. will be dropped soon
+%attr(755,root,root) %{_bindir}/run-parts.sh
 %attr(755,root,root) %{_bindir}/usleep
 
 %attr(755,root,root) %{_sbindir}/consoletype
@@ -304,6 +333,7 @@ mv -f /etc/sysconfig/network-scripts/ifcfg-* /etc/sysconfig/interfaces
 %{systemdunitdir}/sys-chroots.service
 
 %dir /lib/rc-scripts
+%attr(755,root,root) /lib/rc-scripts/ifdown-bond
 %attr(755,root,root) /lib/rc-scripts/ifdown-br
 %attr(755,root,root) /lib/rc-scripts/ifdown-irda
 %attr(755,root,root) /lib/rc-scripts/ifdown-post
@@ -311,6 +341,7 @@ mv -f /etc/sysconfig/network-scripts/ifcfg-* /etc/sysconfig/interfaces
 %attr(755,root,root) /lib/rc-scripts/ifdown-sl
 %attr(755,root,root) /lib/rc-scripts/ifdown-vlan
 /lib/rc-scripts/ifup-aliases
+%attr(755,root,root) /lib/rc-scripts/ifup-bond
 %attr(755,root,root) /lib/rc-scripts/ifup-br
 %attr(755,root,root) /lib/rc-scripts/ifup-ipx
 %attr(755,root,root) /lib/rc-scripts/ifup-irda