From 3cb8fd23163e3e82b03ad3214a4b623467651751ae5446a7ab73d1e8f0de55a7 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Mon, 26 Oct 2020 14:42:10 +0000 Subject: [PATCH] - Make sure the release number between the main and the branding packages match OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-default-settings?expand=0&rev=7 --- systemd-default-settings.changes | 6 ++++++ systemd-default-settings.spec | 12 ++++++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/systemd-default-settings.changes b/systemd-default-settings.changes index 6dd023e..3914bdc 100644 --- a/systemd-default-settings.changes +++ b/systemd-default-settings.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Oct 26 14:40:56 UTC 2020 - Franck Bui + +- Make sure the release number between the main and the branding + packages match + ------------------------------------------------------------------- Fri Oct 23 08:09:00 UTC 2020 - Franck Bui diff --git a/systemd-default-settings.spec b/systemd-default-settings.spec index b3992fa..04a8159 100644 --- a/systemd-default-settings.spec +++ b/systemd-default-settings.spec @@ -26,7 +26,7 @@ Group: System/Base Source0: %{name}-%{version}.tar.gz BuildArch: noarch BuildRequires: systemd-rpm-macros -Requires: %{name}-branding = %{version} +Requires: %{name}-branding = %{version}-%{release} %description This package overrides some of the upstream default settings which are @@ -38,9 +38,9 @@ pulled in by the branding package instead. %package branding-SLE Summary: Specific customization of systemd defaults settings for SLE Group: System/Base -Requires: %{name} = %{version} +Requires: %{name} = %{version}-%{release} Supplements: packageand(%{name}:branding-SLE) -Provides: %{name}-branding = %{version} +Provides: %{name}-branding = %{version}-%{release} Conflicts: otherproviders(%{name}-branding) %description branding-SLE @@ -50,9 +50,9 @@ them better suited for SLE distributions. %package branding-openSUSE Summary: Specific customization of systemd defaults settings for openSUSE Group: System/Base -Requires: %{name} = %{version} +Requires: %{name} = %{version}-%{release} Supplements: packageand(%{name}:branding-openSUSE) -Provides: %{name}-branding = %{version} +Provides: %{name}-branding = %{version}-%{release} Conflicts: otherproviders(%{name}-branding) %description branding-openSUSE @@ -62,7 +62,7 @@ them better suited for openSUSE distributions. %package branding-upstream Summary: Restore upstream systemd defaults settings Group: System/Base -Provides: %{name}-branding = %{version} +Provides: %{name}-branding = %{version}-%{release} Conflicts: %{name} Conflicts: otherproviders(%{name}-branding)