- updated to 0.5.4, partial merge of .spec changes from PLD

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

diff --git a/rc-scripts.spec b/rc-scripts.spec
index fe174423ff58ef0f27288c24d7f48ca9e4e86923..ffc8cfb1f461c3461ca667e3fddc0a9ab5c5ff74 100644 (file)
--- a/rc-scripts.spec
+++ b/rc-scripts.spec
@@ -7,64 +7,55 @@ 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
 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.12
-Release:       4
+Version:       0.5.4
+Release:       1

 License:       GPL v2
 Group:         Base
 Source0:       %{name}-%{version}.tar.gz
 License:       GPL v2
 Group:         Base
 Source0:       %{name}-%{version}.tar.gz

-# 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.patch
-Patch107:      %{name}-misc.patch
-URL:           http://svn.pld-linux.org/trac/svn/wiki/packages/rc-scripts
+# Source0-md5: 67e8af74740cc3589257faf026f1ac23
+URL:           https://git.tld-linux.org/?p=rc-scripts.git

 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: autoconf
 BuildRequires: automake

-BuildRequires: gettext-devel
+BuildRequires: gettext-tools

 BuildRequires: glib2-devel
 %{?with_static:BuildRequires:  glib2-static}
 %{?with_static:BuildRequires:  glibc-static}
 BuildRequires: libcap-devel >= 1:2.17
 BuildRequires: linux-libc-headers >= 7:2.6.27
 BuildRequires: pkgconfig
 BuildRequires: glib2-devel
 %{?with_static:BuildRequires:  glib2-static}
 %{?with_static:BuildRequires:  glibc-static}
 BuildRequires: libcap-devel >= 1:2.17
 BuildRequires: linux-libc-headers >= 7:2.6.27
 BuildRequires: pkgconfig

+BuildRequires: pcre-devel
+%{?with_static:BuildRequires:  pcre-static}

 BuildRequires: popt-devel
 BuildRequires: rpm >= 4.4.9-56
 Requires(post):        fileutils
 BuildRequires: popt-devel
 BuildRequires: rpm >= 4.4.9-56
 Requires(post):        fileutils

-%ifarch sparc sparcv9 sparc64
-Requires:      agetty
-%endif

 Requires:      /bin/awk
 Requires:      /bin/basename
 Requires:      /bin/gettext
 Requires:      /bin/awk
 Requires:      /bin/basename
 Requires:      /bin/gettext

+Requires:      /bin/ipcalc

 Requires:      /bin/nice
 Requires:      /bin/ps
 Requires:      SysVinit-tools >= 2.88-1
 Requires:      blockdev
 Requires:      coreutils
 Requires:      ethtool
 Requires:      /bin/nice
 Requires:      /bin/ps
 Requires:      SysVinit-tools >= 2.88-1
 Requires:      blockdev
 Requires:      coreutils
 Requires:      ethtool

-Requires:      virtual(init-daemon)
-Requires:      filesystem >= 4.0-1
+Requires:      run-parts = %{version}-%{release}
+Requires:      virtual-init-daemon
+Requires:      filesystem >= 4.1-19

 Requires:      findutils
 Requires:      fsck
 Requires:      gettext
 Requires:      grep
 Requires:      hostname
 Requires:      findutils
 Requires:      fsck
 Requires:      gettext
 Requires:      grep
 Requires:      hostname

+Requires:      ipcalc >= 1.0.1-2

 Requires:      iproute2
 Requires:      iproute2

+Requires:      iproute2-tc

 Requires:      iputils-arping
 Requires:      iputils-arping

-Requires:      mingetty
+Requires:      libutempter >= 1.1.6-2

 Requires:      mktemp
 Requires:      mount >= 2.12
 Requires:      procps >= 1:3.2.6-1.1
 Requires:      psmisc >= 22.5-2
 Requires:      mktemp
 Requires:      mount >= 2.12
 Requires:      procps >= 1:3.2.6-1.1
 Requires:      psmisc >= 22.5-2

-Requires:      libutempter >= 1.1.6-2
-Requires:      util-linux
+Requires:      util-linux >= 2.22.1

 Requires:      virtual(module-tools)
 Suggests:      libcgroup
 Obsoletes:     initscripts
 Requires:      virtual(module-tools)
 Suggests:      libcgroup
 Obsoletes:     initscripts


@@ -72,13 +63,15 @@ Obsoletes:  vserver-rc-scripts
 Conflicts:     LPRng < 3.8.0-2
 Conflicts:     dev < 2.9.0-22
 Conflicts:     iputils-arping < 2:s20070202-1
 Conflicts:     LPRng < 3.8.0-2
 Conflicts:     dev < 2.9.0-22
 Conflicts:     iputils-arping < 2:s20070202-1

+# character classes support required
+Conflicts:     mawk < 1.3.4-0.20090727

 Conflicts:     openssh-server < 2:3.6.1p2-6
 Conflicts:     psacct < 6.3.5-10
 Conflicts:     tzdata < 2007b-1.1
 Conflicts:     udev-core < 1:135-2
 Conflicts:     openssh-server < 2:3.6.1p2-6
 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:     SysVinit < 2.88-16

-Conflicts:     upstart-SysVinit < 2.86-25
+Conflicts:     lvm2 < 2.02.83
+Conflicts:     upstart

 Conflicts:     wpa_supplicant < 0.6.3
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 Conflicts:     wpa_supplicant < 0.6.3
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 


@@ -88,7 +81,7 @@ BuildRoot:    %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define                _sbindir        /sbin
 
 %description
 %define                _sbindir        /sbin
 
 %description

-This package contains the scripts use to boot a system, change run
+This package contains the scripts used to boot a system, change run

 levels, and shut the system down cleanly.
 
 %description -l de.UTF-8
 levels, and shut the system down cleanly.
 
 %description -l de.UTF-8


@@ -113,16 +106,24 @@ düzgün bir şekilde kapatmak için gereken dosyaları içerir. Ayrıca pek
 çok bilgisayar ağı arayüzlerini etkinleştiren ya da edilginleştiren
 programcıklar içerir.
 
 çok bilgisayar ağı arayüzlerini etkinleştiren ya da edilginleştiren
 programcıklar içerir.
 

+%package -n run-parts
+Summary:       Run scripts or programs in a directory
+Summary(pl.UTF-8):     Uruchamianie skryptów lub programów z katalogu
+Group:         Base
+Conflicts:     rc-scripts < 0.5.4-1
+
+%description -n run-parts
+run-parts runs all the executable files named within specific
+constraints, found in directory directory. Other files and directories
+are silently ignored.
+
+%description -n run-parts -l pl.UTF-8
+Program run-parts pozwala na uruchamianie wszystkich plików zgodnych z
+pewnymi ograniczeniami, obecnych w katalogu. Inne pliki i katalogi są
+po cichu ignorowane.
+

 %prep
 %setup -q
 %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"
 
 # 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"


@@ -142,12 +143,15 @@ sed -i -e 's#^GLIB_LIBS=.*#GLIB_LIBS="%{_prefix}/%{_lib}/libglib-2.0.a -lrt -lpt
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/var/{run/netreport,log} \
        $RPM_BUILD_ROOT/etc/sysconfig/{interfaces/data,hwprofiles} \
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/var/{run/netreport,log} \
        $RPM_BUILD_ROOT/etc/sysconfig/{interfaces/data,hwprofiles} \

-       $RPM_BUILD_ROOT{%{systemdtmpfilesdir},%{systemdunitdir}}
+       $RPM_BUILD_ROOT%{_sysconfdir}/{modules-load.d,sysctl.d}

 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT \
        %{!?with_static:ppp_watch_LDADD="$(pkg-config --libs glib-2.0)" ppp_watch_DEPENDENCIES=}
 
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT \
        %{!?with_static:ppp_watch_LDADD="$(pkg-config --libs glib-2.0)" ppp_watch_DEPENDENCIES=}
 

+# deprecated shell version
+%{__rm} $RPM_BUILD_ROOT%{_bindir}/run-parts.sh
+

 for i in 0 1 2 3 4 5 6; do
        install -d $RPM_BUILD_ROOT/etc/rc.d/rc$i.d
 done
 for i in 0 1 2 3 4 5 6; do
        install -d $RPM_BUILD_ROOT/etc/rc.d/rc$i.d
 done


@@ -191,13 +195,7 @@ done
 # make /etc/init.d symlink relative
 ln -nfs rc.d/init.d $RPM_BUILD_ROOT/etc/init.d
 
 # make /etc/init.d symlink relative
 ln -nfs rc.d/init.d $RPM_BUILD_ROOT/etc/init.d
 

-# systemd
-install %{SOURCE1} $RPM_BUILD_ROOT%{systemdunitdir}/rc-local.service
-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)
+# packaged into SysVinit

 %{__rm} $RPM_BUILD_ROOT%{_mandir}/man5/crypttab.5
 
 %clean
 %{__rm} $RPM_BUILD_ROOT%{_mandir}/man5/crypttab.5
 
 %clean


@@ -248,18 +246,6 @@ done
 /etc/init.d
 /etc/rc.d/init.d/functions
 
 /etc/init.d
 /etc/rc.d/init.d/functions
 

-%config(noreplace) %verify(not md5 mtime size) /etc/init/allowlogin.conf
-%config(noreplace) %verify(not md5 mtime size) /etc/init/cpusets.conf
-%config(noreplace) %verify(not md5 mtime size) /etc/init/cryptsetup.conf
-%config(noreplace) %verify(not md5 mtime size) /etc/init/local.conf
-%config(noreplace) %verify(not md5 mtime size) /etc/init/modules.conf
-%config(noreplace) %verify(not md5 mtime size) /etc/init/random.conf
-%config(noreplace) %verify(not md5 mtime size) /etc/init/rc.conf
-%config(noreplace) %verify(not md5 mtime size) /etc/init/rcS-sulogin.conf
-%config(noreplace) %verify(not md5 mtime size) /etc/init/rcS.conf
-%config(noreplace) %verify(not md5 mtime size) /etc/init/sys-chroots.conf
-%config(noreplace) %verify(not md5 mtime size) /etc/init/udev.conf
-

 %attr(754,root,root) /etc/rc.d/init.d/allowlogin
 %attr(754,root,root) /etc/rc.d/init.d/cpusets
 %attr(754,root,root) /etc/rc.d/init.d/cryptsetup
 %attr(754,root,root) /etc/rc.d/init.d/allowlogin
 %attr(754,root,root) /etc/rc.d/init.d/cpusets
 %attr(754,root,root) /etc/rc.d/init.d/cryptsetup


@@ -301,18 +287,15 @@ done
 %attr(755,root,root) /etc/profile.d/lang.*sh
 
 %attr(755,root,root) %{_bindir}/doexec
 %attr(755,root,root) /etc/profile.d/lang.*sh
 
 %attr(755,root,root) %{_bindir}/doexec

-%attr(755,root,root) %{_bindir}/ipcalc

 %attr(755,root,root) %{_bindir}/resolvesymlink
 %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
 %attr(755,root,root) %{_sbindir}/genhostid
 %attr(755,root,root) %{_sbindir}/getkey
 %attr(755,root,root) %{_sbindir}/hwprofile
 %attr(755,root,root) %{_bindir}/usleep
 
 %attr(755,root,root) %{_sbindir}/consoletype
 %attr(755,root,root) %{_sbindir}/genhostid
 %attr(755,root,root) %{_sbindir}/getkey
 %attr(755,root,root) %{_sbindir}/hwprofile

-%attr(755,root,root) %{_sbindir}/if*
+%attr(755,root,root) %{_sbindir}/ifdown
+%attr(755,root,root) %{_sbindir}/ifup

 %attr(755,root,root) %{_sbindir}/initlog
 %attr(755,root,root) %{_sbindir}/loglevel
 %attr(755,root,root) %{_sbindir}/minilogd
 %attr(755,root,root) %{_sbindir}/initlog
 %attr(755,root,root) %{_sbindir}/loglevel
 %attr(755,root,root) %{_sbindir}/minilogd


@@ -322,16 +305,12 @@ done
 %attr(755,root,root) %{_sbindir}/setsysfont
 %attr(755,root,root) %{_sbindir}/setuidgid
 %attr(755,root,root) %{_sbindir}/start-stop-daemon
 %attr(755,root,root) %{_sbindir}/setsysfont
 %attr(755,root,root) %{_sbindir}/setuidgid
 %attr(755,root,root) %{_sbindir}/start-stop-daemon

-%attr(755,root,root) %{_sbindir}/tnl*
+%attr(755,root,root) %{_sbindir}/tnldown
+%attr(755,root,root) %{_sbindir}/tnlup

 %attr(4755,root,root) %{_sbindir}/usernetctl
 
 %attr(755,root,root) /lib/firmware/firmware-loader.sh
 
 %attr(4755,root,root) %{_sbindir}/usernetctl
 
 %attr(755,root,root) /lib/firmware/firmware-loader.sh
 

-%{systemdtmpfilesdir}/rc-scripts.conf
-%{systemdunitdir}/local.service
-%{systemdunitdir}/rc-local.service
-%{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
 %dir /lib/rc-scripts
 %attr(755,root,root) /lib/rc-scripts/ifdown-bond
 %attr(755,root,root) /lib/rc-scripts/ifdown-br


@@ -354,11 +333,19 @@ done
 /lib/rc-scripts/ifup-routes
 %attr(755,root,root) /lib/rc-scripts/ifup-sl
 %attr(755,root,root) /lib/rc-scripts/ifup-vlan
 /lib/rc-scripts/ifup-routes
 %attr(755,root,root) /lib/rc-scripts/ifup-sl
 %attr(755,root,root) /lib/rc-scripts/ifup-vlan

+%attr(755,root,root) /lib/rc-scripts/makepid

 /lib/rc-scripts/functions.network
 /lib/rc-scripts/functions
 
 %dir %{_sysconfdir}/ppp
 /lib/rc-scripts/functions.network
 /lib/rc-scripts/functions
 
 %dir %{_sysconfdir}/ppp

-%attr(754,root,root) %{_sysconfdir}/ppp/*
+%attr(754,root,root) %{_sysconfdir}/ppp/auth-down
+%attr(754,root,root) %{_sysconfdir}/ppp/auth-up
+%attr(754,root,root) %{_sysconfdir}/ppp/ip-down
+%attr(754,root,root) %{_sysconfdir}/ppp/ip-up
+%attr(754,root,root) %{_sysconfdir}/ppp/ipv6-down
+%attr(754,root,root) %{_sysconfdir}/ppp/ipv6-up
+%attr(754,root,root) %{_sysconfdir}/ppp/ipx-down
+%attr(754,root,root) %{_sysconfdir}/ppp/ipx-up

 %dir /etc/sysconfig/cpusets
 %dir /etc/sysconfig/hwprofiles
 %dir /etc/sysconfig/interfaces
 %dir /etc/sysconfig/cpusets
 %dir /etc/sysconfig/hwprofiles
 %dir /etc/sysconfig/interfaces


@@ -366,10 +353,10 @@ done
 %dir /etc/sysconfig/isapnp
 
 %dir /etc/sysconfig/interfaces/down.d
 %dir /etc/sysconfig/isapnp
 
 %dir /etc/sysconfig/interfaces/down.d

-%dir /etc/sysconfig/interfaces/down.d/*
-%dir /etc/sysconfig/interfaces/up.d
-%dir /etc/sysconfig/interfaces/up.d/*
+%dir /etc/sysconfig/interfaces/down.d/ppp

 %attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/interfaces/down.d/ppp/logger
 %attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/interfaces/down.d/ppp/logger

+%dir /etc/sysconfig/interfaces/up.d
+%dir /etc/sysconfig/interfaces/up.d/ppp

 %attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/interfaces/up.d/ppp/logger
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/isapnp/isapnp-kernel.conf
 
 %attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/interfaces/up.d/ppp/logger
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/isapnp/isapnp-kernel.conf
 


@@ -394,7 +381,19 @@ done
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/static-routes6
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/system
 
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/static-routes6
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/system
 

-%{_mandir}/man?/*
+%dir %{_sysconfdir}/modules-load.d
+%dir %{_sysconfdir}/sysctl.d
+
+%{_mandir}/man1/consoletype.1*
+%{_mandir}/man1/doexec.1*
+%{_mandir}/man1/genhostid.1*
+%{_mandir}/man1/getkey.1*
+%{_mandir}/man1/initlog.1*
+%{_mandir}/man1/netreport.1*
+%{_mandir}/man1/usleep.1*
+%{_mandir}/man8/ppp-watch.8*
+%{_mandir}/man8/start-stop-daemon.8*
+%{_mandir}/man8/usernetctl.8*

 %lang(de) %{_mandir}/de/man?/*
 %lang(es) %{_mandir}/es/man?/*
 %lang(fr) %{_mandir}/fr/man?/*
 %lang(de) %{_mandir}/de/man?/*
 %lang(es) %{_mandir}/es/man?/*
 %lang(fr) %{_mandir}/fr/man?/*


@@ -405,3 +404,8 @@ done
 %dir %{localedir}
 %lang(de) %{localedir}/de
 %lang(pl) %{localedir}/pl
 %dir %{localedir}
 %lang(de) %{localedir}/de
 %lang(pl) %{localedir}/pl

+
+%files -n run-parts
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/run-parts
+%{_mandir}/man8/run-parts.8*