From e47eaedd18e24c8f4c5914e2abf419c578dbdf73 Mon Sep 17 00:00:00 2001
From: Silvan Calarco <silvan.calarco@mambasoft.it>
Date: Fri, 5 Jan 2024 23:55:04 +0100
Subject: [PATCH] update to 2.5 [release 2.5-1mamba;Sat Jan 08 2022]

---
 initscripts.spec | 51 +++++++++++++++++++++++++-----------------------
 1 file changed, 27 insertions(+), 24 deletions(-)

diff --git a/initscripts.spec b/initscripts.spec
index 01d83d2..95e9dd8 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -1,14 +1,14 @@
 %define utmp_groupid 17
 
 Name:          initscripts
-Version:       2.4
+Version:       2.5
 Release:       1mamba
 Summary:       Common tools used by initscripts-sysv5 and systemd in sysv5 mode
 Group:         System/Configuration
 Vendor:        openmamba
 Distribution:  openmamba
 Packager:      Silvan Calarco <silvan.calarco@mambasoft.it>
-URL:           http://www.openmamba.org/packages.html
+URL:           https://openmamba.org/en/
 Source:        https://gitlab.mambasoft.it/openmamba/initscripts.git/v%{version}/initscripts-%{version}.tar.bz2
 Patch0:        %{name}-1.3.33-initlog_deprecated_warning.patch
 Patch1:        initscripts-1.6.11-gcc-4.7.patch
@@ -28,6 +28,7 @@ Requires:      e2fsprogs
 Requires:      gzip
 Requires:      findutils
 Requires:      psmisc
+Requires:      hwdata
 Provides:      /etc/init.d
 Obsoletes:     initscripts-sysv5 < 2.4
 
@@ -36,23 +37,23 @@ The initscripts package contains the basic system scripts used to boot your open
 
 %debug_package
 
+%package tools
+Summary:       Obsolete tools formerly used by SysV5 initscripts
+Group:         System/Tools
+
+%description tools
+Obsolete tools formerly used by SysV5 initscripts.
+
 %prep
 %setup -q
 %patch1 -p1
 
 %build
-%make CC=%{_target_platform}-gcc
+%make CC=%{_target_platform}-gcc tools
 
 %install
 [ "%{buildroot}" != / ] && rm -rf %{buildroot}
-%makeinstall
-
-%ifnarch %{ix86} x86_64
-# don't blacklist framebuffer drivers for non x86 archs which don't have VESA/BIOS
-rm -f %{buildroot}%{_prefix}/lib/modprobe.d/blacklist-framebuffer.conf
-# RTC clock is kept as localtime on PCs only due to windows
-#sed -i "s|UTC=0|UTC=1|" %{buildroot}%{_sysconfdir}/sysconfig/clock
-%endif
+%makeinstall install-tools
 
 %clean
 [ "%{buildroot}" != / ] && rm -rf %{buildroot}
@@ -144,20 +145,9 @@ fi
 %dir %{_sysconfdir}/modules.d
 %{_sysconfdir}/sysconfig/functions
 %{_sysconfdir}/sysconfig/rc
-%{_bindir}/doexec
-%{_bindir}/ipcalc
-%{_bindir}/usleep
-%{_sbindir}/console_init
 %{_sbindir}/service
-%{_sbindir}/consoletype
-%{_sbindir}/genhostid
-%{_sbindir}/getkey
-%{_sbindir}/minilogd
 %{_prefix}/lib/modprobe.d/lp.conf
 %{_prefix}/lib/modprobe.d/rtl8192ce.conf
-%ifarch %{ix86} x86_64
-%{_prefix}/lib/modprobe.d/blacklist-framebuffer.conf
-%endif
 %{_prefix}/lib/modprobe.d/blacklist-net.conf
 %{_prefix}/lib/sysctl.d/40-openmamba.conf
 %ghost %attr(0600,root,utmp) %{_var}/log/btmp
@@ -165,7 +155,17 @@ fi
 %ghost %attr(0644,root,root) %{_var}/log/wtmp
 #%ghost %attr(0664,root,utmp) %{_var}/run/utmp
 #%dir %{_var}/run/netreport
-%dir %{_var}/spool/gdm
+%doc COPYING
+
+%files tools
+%defattr(-,root,root)
+%{_bindir}/doexec
+%{_bindir}/ipcalc
+%{_bindir}/usleep
+%{_sbindir}/consoletype
+%{_sbindir}/genhostid
+%{_sbindir}/getkey
+%{_sbindir}/minilogd
 %attr(4755,root,root) %{_sbindir}/usernetctl
 %{_mandir}/man1/consoletype.*
 %{_mandir}/man1/doexec.*
@@ -175,9 +175,12 @@ fi
 %{_mandir}/man1/netreport.*
 %{_mandir}/man1/usleep.*
 %{_mandir}/man8/usernetctl.*
-%doc COPYING 
+%doc COPYING
 
 %changelog
+* Sat Jan 08 2022 Silvan Calarco <silvan.calarco@mambasoft.it> 2.5-1mamba
+- update to 2.5
+
 * Thu Aug 26 2021 Silvan Calarco <silvan.calarco@mambasoft.it> 2.4-1mamba
 - update to 2.4