From 475d0cfb2df898fe2d6613cf2f89a42ec9c6e197 Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Wed, 22 May 2024 01:59:30 +0200 Subject: [PATCH] - updated to 0.5.4, partial merge of .spec changes from PLD --- rc-scripts.spec | 92 +++++++++++++++++++++++++++++++++++++------------ 1 file changed, 70 insertions(+), 22 deletions(-) diff --git a/rc-scripts.spec b/rc-scripts.spec index cd029fc..ffc8cfb 100644 --- a/rc-scripts.spec +++ b/rc-scripts.spec @@ -7,12 +7,12 @@ 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.5.3 +Version: 0.5.4 Release: 1 License: GPL v2 Group: Base Source0: %{name}-%{version}.tar.gz -# Source0-md5: 4d4edbbda63e5229573eda3b6c507e35 +# Source0-md5: 67e8af74740cc3589257faf026f1ac23 URL: https://git.tld-linux.org/?p=rc-scripts.git BuildRequires: autoconf BuildRequires: automake @@ -23,35 +23,39 @@ BuildRequires: glib2-devel 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 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: run-parts = %{version}-%{release} Requires: virtual-init-daemon -Requires: filesystem >= 4.0-1 +Requires: filesystem >= 4.1-19 Requires: findutils Requires: fsck Requires: gettext Requires: grep Requires: hostname +Requires: ipcalc >= 1.0.1-2 Requires: iproute2 Requires: iproute2-tc 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: libutempter >= 1.1.6-2 -Requires: util-linux +Requires: util-linux >= 2.22.1 Requires: virtual(module-tools) Suggests: libcgroup Obsoletes: initscripts @@ -59,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 +# 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: lvm2 < 2.02.83 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) @@ -75,7 +81,7 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %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 @@ -100,6 +106,22 @@ 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. +%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 @@ -120,12 +142,16 @@ sed -i -e 's#^GLIB_LIBS=.*#GLIB_LIBS="%{_prefix}/%{_lib}/libglib-2.0.a -lrt -lpt %install 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/etc/sysconfig/{interfaces/data,hwprofiles} \ + $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=} +# 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 @@ -169,7 +195,7 @@ done # make /etc/init.d symlink relative ln -nfs rc.d/init.d $RPM_BUILD_ROOT/etc/init.d -# packaged into SysVinit and systemd-init (supported options differ) +# packaged into SysVinit %{__rm} $RPM_BUILD_ROOT%{_mandir}/man5/crypttab.5 %clean @@ -261,18 +287,15 @@ done %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}/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) %{_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 @@ -282,7 +305,8 @@ 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}/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 @@ -314,7 +338,14 @@ done /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 @@ -322,10 +353,10 @@ done %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 +%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 @@ -350,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 -%{_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?/* @@ -361,3 +404,8 @@ done %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* -- 2.46.0