10.21

.gitignore

@@ -57,3 +57,4 @@
 /initscripts-10.18.tar.gz
 /initscripts-10.19.tar.gz
 /initscripts-10.20.tar.gz
+/initscripts-10.21.tar.gz

initscripts.spec

@@ -18,7 +18,7 @@ Requires:         gawk                       \
 
 Name:             initscripts
 Summary:          Basic support for legacy System V init scripts
-Version:          10.20
+Version:          10.21
 Release:          1%{?dist}
 
 License:          GPL-2.0-only
@@ -55,6 +55,7 @@ BuildRequires:    make
 BuildRequires:    systemd
 
 Obsoletes:        %{name}            < 10.16-1
+Obsoletes:        network-scripts    < 10.21-1
 
 # === PATCHES =================================================================
 
@@ -115,57 +116,6 @@ This package provides service command.
 
 # ---------------
 
-%package -n network-scripts
-Summary:          Legacy scripts for manipulating of network devices
-Requires:         %{name}%{?_isa} = %{version}-%{release}
-
-%shared_requirements
-
-Requires:         bc
-Requires:         dbus
-Requires:         dbus-tools
-Requires:         gawk
-Requires:         grep
-Requires:         hostname
-Requires:         iproute
-Requires:         ipcalc
-Requires:         kmod
-Requires:         procps-ng
-Requires:         sed
-Requires:         systemd
-
-Requires(post):   chkconfig
-Requires(preun):  chkconfig
-
-Requires(post):   %{_sbindir}/update-alternatives
-Requires(postun): %{_sbindir}/update-alternatives
-
-Obsoletes:        %{name}            < 9.82-2
-
-# This is legacy and deprecated, so nobody should depend on this!
-# If ifcfg-style configuration is still desired, NetworkManager can do this.
-# Thus, mark this as deprecated to ensure people know to not depend on it.
-# Cf. https://docs.fedoraproject.org/en-US/packaging-guidelines/deprecating-packages/
-Provides:         deprecated()
-
-%description -n network-scripts
-This package contains the legacy scripts for activating & deactivating of most
-network interfaces. It also provides a legacy version of 'network' service.
-
-The 'network' service is enabled by default after installation of this package,
-and if the network-scripts are installed alongside NetworkManager, then the
-ifup/ifdown commands from network-scripts take precedence over the ones provided
-by NetworkManager.
-
-If user has both network-scripts & NetworkManager installed, and wishes to
-use ifup/ifdown from NetworkManager primarily, then they has to run command:
- $ update-alternatives --config ifup
-
-Please note that running the command above will also disable the 'network'
-service.
-
-# ---------------
-
 %package -n netconsole-service
 Summary:          Service for initializing of network console logging
 Requires:         %{name} = %{version}-%{release}
@@ -225,25 +175,11 @@ Please use systemd-volatile-root functionality instead, if possible.
 # ---------------
 
 %install
-%make_install
+%make_install NO_NETWORK_SCRIPTS=true
 
 # This installs the NLS language files:
 %find_lang %{name}
 
-%ifnarch s390 s390x
-  rm -f %{buildroot}%{_sysconfdir}/sysconfig/network-scripts/ifup-ctc
-%endif
-
-# Additional ways to access documentation:
-install -m 0755 -d %{buildroot}%{_docdir}/network-scripts
-
-ln -s  %{_docdir}/%{name}/sysconfig.txt %{buildroot}%{_docdir}/network-scripts/
-ln -sr %{_mandir}/man8/ifup.8           %{buildroot}%{_mandir}/man8/ifdown.8
-
-# We are now using alternatives approach to better co-exist with NetworkManager:
-touch %{buildroot}%{_sbindir}/ifup
-touch %{buildroot}%{_sbindir}/ifdown
-
 # =============================================================================
 
 %post
@@ -257,24 +193,6 @@ touch %{buildroot}%{_sbindir}/ifdown
 
 # ---------------
 
-%post -n network-scripts
-chkconfig --add network > /dev/null 2>&1 || :
-
-[ -L %{_sbindir}/ifup ]   || rm -f %{_sbindir}/ifup
-[ -L %{_sbindir}/ifdown ] || rm -f %{_sbindir}/ifdown
-
-%{_sbindir}/update-alternatives --install %{_sbindir}/ifup   ifup   %{_sysconfdir}/sysconfig/network-scripts/ifup 90 \
-                                --slave   %{_sbindir}/ifdown ifdown %{_sysconfdir}/sysconfig/network-scripts/ifdown \
-                                --initscript network
-
-%preun -n network-scripts
-if [ $1 -eq 0 ]; then
-  chkconfig --del network > /dev/null 2>&1 || :
-  %{_sbindir}/update-alternatives --remove ifup %{_sysconfdir}/sysconfig/network-scripts/ifup
-fi
-
-# ---------------
-
 %post -n netconsole-service
 %systemd_post netconsole.service
 
@@ -355,26 +273,6 @@ fi
 
 # ---------------
 
-%files -n network-scripts
-%doc doc/examples/
-%dir %{_sysconfdir}/sysconfig/network-scripts
-
-%{_sysconfdir}/rc.d/init.d/network
-%{_sysconfdir}/sysconfig/network-scripts/*
-
-%config(noreplace)    %{_sysconfdir}/sysconfig/network-scripts/ifcfg-lo
-
-%ghost                %{_sbindir}/ifup
-%ghost                %{_sbindir}/ifdown
-%attr(4755,root,root) %{_sbindir}/usernetctl
-
-%{_mandir}/man8/ifup.*
-%{_mandir}/man8/ifdown.*
-%{_mandir}/man8/usernetctl.*
-%{_docdir}/network-scripts/*
-
-# ---------------
-
 %files -n netconsole-service
 %config(noreplace) %{_sysconfdir}/sysconfig/netconsole
 
@@ -398,6 +296,12 @@ fi
 # =============================================================================
 
 %changelog
+* Wed Feb 07 2024 Jan Macku <jamacku@redhat.com> - 10.21-1
+- fedora: don't build network-scripts rpm in f40+ (2/2)
+- ci: trigger copr build on every push to main branch
+- ifup-routes: print warning when ADDRESS0 entry is missing
+- fedora: don't build network-scripts rpm in f40+
+
 * Tue Jan 30 2024 Jan Macku <jamacku@redhat.com> - 10.20-1
 - Translated using Weblate (Georgian)
 - Add -r to while read as per shellcheck

sources

@@ -1 +1 @@
-SHA512 (initscripts-10.20.tar.gz) = cb9028cf0589d5f22e74cf828e962012c60435fd9499426a401bcc6a7be6ec984f2624e65a32f0f43c0d39ee0c9d8409b29d0d898eb9d518598dbe91ab9de9d2
+SHA512 (initscripts-10.21.tar.gz) = be3f7e61673666f07f5ebc79f8f367cd0547c1d39653e4ad929010a5a29626bfbc8a369ab4c67b1a5f6249362192bd9198891e68f148d3dd7aca8b1da2142366