rebase to 10.25

Resolves: RHEL-28190
This commit is contained in:
Jan Macku 2024-06-25 10:05:06 +02:00
parent b76f0357e0
commit 9f06442f6c
3 changed files with 24 additions and 7 deletions

1
.gitignore vendored
View File

@ -58,3 +58,4 @@
/initscripts-10.19.tar.gz
/initscripts-10.20.tar.gz
/initscripts-10.21.tar.gz
/initscripts-10.25.tar.gz

View File

@ -18,8 +18,8 @@ Requires: gawk \
Name: initscripts
Summary: Basic support for legacy System V init scripts
Version: 10.21
Release: 2%{?dist}
Version: 10.25
Release: 1%{?dist}
License: GPL-2.0-only
@ -55,7 +55,7 @@ BuildRequires: make
BuildRequires: systemd
Obsoletes: %{name} < 10.16-1
Obsoletes: network-scripts < 10.21-1
Obsoletes: network-scripts < 10.25-1
# === PATCHES =================================================================
@ -180,6 +180,11 @@ Please use systemd-volatile-root functionality instead, if possible.
# This installs the NLS language files:
%find_lang %{name}
%if "%{_sbindir}" == "%{_bindir}"
# Some files get installed wrong, but if $(sbindir) is overriden, the build fails :(
mv -v %{buildroot}/usr/sbin/* %{buildroot}%{_bindir}/
%endif
# =============================================================================
%post
@ -240,7 +245,7 @@ Please use systemd-volatile-root functionality instead, if possible.
# ---------------
%{_bindir}/*
%{_bindir}/usleep
%{_sbindir}/consoletype
%{_sbindir}/genhostid
@ -296,8 +301,19 @@ Please use systemd-volatile-root functionality instead, if possible.
# =============================================================================
%changelog
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 10.21-2
- Bump release for June 2024 mass rebuild
* Tue Jun 25 2024 Jan Macku <jamacku@redhat.com> - 10.25-1
- Revert "fix: return support for network-scripts for Fedora 40"
* Wed May 29 2024 Jan Macku <jamacku@redhat.com> - 10.24-1
- Fix build when %_bindir==%_sbindir
* Tue Apr 16 2024 Jan Macku <jamacku@redhat.com> - 10.23-1
- fix: return support for network-scripts for Fedora 40
* Wed Mar 06 2024 Jan Macku <jamacku@redhat.com> - 10.22-1
- Translated using Weblate (Georgian)
- rename_device: free path after it is used
- rename_device: remove trailing whitespaces
* Wed Feb 07 2024 Jan Macku <jamacku@redhat.com> - 10.21-1
- fedora: don't build network-scripts rpm in f40+ (2/2)

View File

@ -1 +1 @@
SHA512 (initscripts-10.21.tar.gz) = be3f7e61673666f07f5ebc79f8f367cd0547c1d39653e4ad929010a5a29626bfbc8a369ab4c67b1a5f6249362192bd9198891e68f148d3dd7aca8b1da2142366
SHA512 (initscripts-10.25.tar.gz) = 6bda528ba1ba59511d51e8b58e63631bd99e8f6dd4a8a1a93d62bc09f642682f9797ce795b4337a771179c65176a87b00f8da36a86a6d3d22aef26382f274163