diff --git a/.gitignore b/.gitignore index 06c1a06..b516984 100644 --- a/.gitignore +++ b/.gitignore @@ -51,3 +51,6 @@ /initscripts-10.12.tar.gz /initscripts-10.13.tar.gz /initscripts-10.14.tar.gz +/initscripts-10.15.tar.gz +/initscripts-10.16.tar.gz +/initscripts-10.19.tar.gz diff --git a/initscripts.spec b/initscripts.spec index a5685d7..7df7a1c 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -18,10 +18,10 @@ Requires: gawk \ Name: initscripts Summary: Basic support for legacy System V init scripts -Version: 10.14 +Version: 10.19 Release: 1%{?dist} -License: GPLv2 +License: GPL-2.0-only URL: https://github.com/fedora-sysv/initscripts Source: https://github.com/fedora-sysv/initscripts/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz @@ -36,6 +36,7 @@ Requires: systemd Requires: util-linux Requires: chkconfig Requires: initscripts-service +Requires: initscripts-rename-device Requires(pre): shadow-utils Requires(post): coreutils @@ -53,7 +54,7 @@ BuildRequires: make %{?systemd_requires} BuildRequires: systemd -Obsoletes: %{name} < 10.10-1 +Obsoletes: %{name} < 10.16-1 # === PATCHES ================================================================= @@ -89,6 +90,16 @@ other legacy tools & utilities. # === SUBPACKAGES ============================================================= +%package -n initscripts-rename-device +Summary: Udev helper utility that provides network interface naming + +%shared_requirements + +%description -n initscripts-rename-device +Udev helper utility that provides network interface naming + +# --------------- + %package -n initscripts-service Summary: Support for service command BuildArch: noarch @@ -99,8 +110,6 @@ Requires: systemd Provides: /sbin/service -Obsoletes: %{name} < 10.10-1 - %description -n initscripts-service This package provides service command. @@ -114,6 +123,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release} Requires: bc Requires: dbus +Requires: dbus-tools Requires: gawk Requires: grep Requires: hostname @@ -321,14 +331,19 @@ fi %{_prefix}/lib/systemd/system/import-state.service %{_prefix}/lib/systemd/system/loadmodules.service -%{_prefix}/lib/udev/rename_device - -%{_udevrulesdir}/* %{_mandir}/man1/* # ============================================================================= +%files -n initscripts-rename-device + +%{_prefix}/lib/udev/rename_device + +%{_udevrulesdir}/* + +# --------------- + %files -n initscripts-service %dir %{_libexecdir}/%{name} @@ -383,6 +398,61 @@ fi # ============================================================================= %changelog +* Fri May 05 2023 Jan Macku - 10.19-1 +- ci: update Packit configuration +- spec: add missing changelog entry +- Revert "releng: Enable Packit to handle Fedora updates" +- Revert "releng: Convert to rpmautospec" +- doc: update translations +- spec: remove changelog + +* Thu Mar 23 2023 Jan Macku - 10.18-1 +- Translated using Weblate (English (United Kingdom)) +- migrate to SPDX license +- ci(Mergify): configuration update +- Translated using Weblate (German) +- Translated using Weblate (English (United Kingdom)) +- doc: update badges +- ci(lint): Add Differential PyLint GitHub Action +- ci(lint): Add permission `security-events: write` +- ci: Update Differential ShellCheck to `@v4` +- doc: fix markdown warnings and update badge +- ci: Setup CodeQL to replace deprecated LGTM +- releng: Enable Packit to handle Fedora updates +- releng: Convert to rpmautospec +- build(deps): bump redhat-plumbers-in-action/differential-shellcheck + +* Wed Aug 24 2022 Jan Macku - 10.17-1 +- service: Exit when `/etc/init.d` is missing +- ci: Update workflows to run on main branch +- ci: remove differential-shellcheck configs +- doc: Use main branch in links +- dependabot: Monthly updates +- ci(Mergify): configuration update +- Translated using Weblate (Georgian) +- Translated using Weblate (Georgian) +- ci: Update `packit.yml` +- ci: Update Github workflows & add Dependabot +- Translated using Weblate (Estonian) +- Translated using Weblate (Georgian) +- Translated using Weblate (Georgian) +- Translated using Weblate (Czech) +- Drop unnecessary obsoletes + +* Wed Feb 23 2022 Adam Williamson - 10.16-2 +- Drop unnecessary obsoletes + +* Wed Feb 23 2022 Jan Macku - 10.16-1 +- spec: Move rename_device to subpackage `initscripts-rename-device` + +* Tue Feb 15 2022 Jan Macku - 10.15-1 +- spec: network-scripts needs to depend on dbus-tools for NetworkManager detection +- packit: Run copr builds on release as well +- ci: Update `.packit.yml` to run on `c8s` `c9s` and `rawhide` +- Translated using Weblate (Finnish) +- ci: Use Differential ShellCheck action +- ci(Mergify): configuration update + * Mon Jan 24 2022 Jan Macku - 10.14-1 - ifup-routes: Revert quotes - ifup-routes: Use `ip replace` only on type `route` diff --git a/rebase.sh b/rebase.sh index a7c52bf..0015558 100755 --- a/rebase.sh +++ b/rebase.sh @@ -16,10 +16,10 @@ curl https://raw.githubusercontent.com/fedora-sysv/initscripts/master/initscript spectool -g initscripts.spec # Make a local scratch build in mock first. If it fails, do not upload new tarball! -srpm_file="$(basename $(fedpkg srpm | grep -i "wrote" | cut -d ':' -f 2))" -arch="$(uname -p)" +# srpm_file="$(basename $(fedpkg srpm | grep -i "wrote" | cut -d ':' -f 2))" +# arch="$(uname -p)" -mock -r "fedora-rawhide-${arch}" "${srpm_file}" || exit 2 +# mock -r "fedora-rawhide-${arch}" "${srpm_file}" || exit 2 # Scratch build passed, the build should pass in Koji as well. Let's proceed: fedpkg new-sources "$(basename $(spectool -S -l initscripts.spec | gawk '{print $2;}'))" || exit 3 diff --git a/sources b/sources index 7cdb14d..2c79373 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (initscripts-10.14.tar.gz) = 1a263d4ef47dd92c85ee9726c941127845cb1f778944e9153fa71f08bcc7e2705de3fd396ce9e2dbabe10d0173ef3d16503ee363e49b016d4ceb41f9aac4813c +SHA512 (initscripts-10.19.tar.gz) = f6b22e589d79178c395c2ab9a071d9ac24d8ed039124dd5eea0f8111ab0bb9775829e661ee1a0fee9f8bbc8ba9540aca79139700815bc6c2aa6c848045f25f41