rpms/initscripts
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Drop unnecessary obsoletes

Browse Source 
Since initscripts requires these packages anyway, the obsoletes
aren't necessary. They're only useful if you split off a new
subpackage and *don't* have the main package require it, but
you still want it to be installed on updates. In this case,
initscripts requires both initscripts-rename-device and
initscripts-service, so there's no need for them to obsolete
older versions of it.

The initscripts-rename-device obsoletes was somehow messing up
live image creation during the openQA update test (caused the
live image not to include initscripts at all). This fixes that.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2022-02-23 17:25:36 -08:00
parent d22d9d9fa5
commit 83747c72df
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
initscripts.spec
View File

@ -19,7 +19,7 @@ Requires: gawk \
Name: initscripts Name: initscripts
Summary: Basic support for legacy System V init scripts Summary: Basic support for legacy System V init scripts
Version: 10.16 Version: 10.16
Release: 1%{?dist} Release: 2%{?dist}
License: GPLv2 License: GPLv2
@ -54,7 +54,7 @@ BuildRequires: make
%{?systemd_requires} %{?systemd_requires}
BuildRequires: systemd BuildRequires: systemd
Obsoletes: %{name} < 10.10-1 Obsoletes: %{name} < 10.16-1
# === PATCHES ================================================================= # === PATCHES =================================================================
@ -95,8 +95,6 @@ Summary: Udev helper utility that provides network interface naming
%shared_requirements %shared_requirements
Obsoletes: %{name} < 10.16-1
%description -n initscripts-rename-device %description -n initscripts-rename-device
Udev helper utility that provides network interface naming Udev helper utility that provides network interface naming
@ -112,8 +110,6 @@ Requires: systemd
Provides: /sbin/service Provides: /sbin/service
Obsoletes: %{name} < 10.10-1
%description -n initscripts-service %description -n initscripts-service
This package provides service command. This package provides service command.
@ -402,6 +398,9 @@ fi
# ============================================================================= # =============================================================================
%changelog %changelog
* Wed Feb 23 2022 Adam Williamson <awilliam@redhat.com> - 10.16-2
- Drop unnecessary obsoletes
* Wed Feb 23 2022 Jan Macku <jamacku@redhat.com> - 10.16-1 * Wed Feb 23 2022 Jan Macku <jamacku@redhat.com> - 10.16-1
- spec: Move rename_device to subpackage `initscripts-rename-device` - spec: Move rename_device to subpackage `initscripts-rename-device`