From d4de1a08940266e17fbcb8b903247eb86c9cd75c Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 10 Feb 2023 10:03:07 +0100 Subject: [PATCH] contrib/rpm: sync obsoletes_{initscripts_updown,ifcfg_rh} version Initially, when we obsoleted {initscripts_updown,ifcfg_rh}, the package versions that we build from this upstream spec file differed from what we put into Fedora/RHEL. By now, this is long gone, and for upstream package builds we don't care to accurately track the version, when using upstream/copr builds. Just sync the version to what they are in Fedora/RHEL. (cherry picked from commit 820f6f3a4a42702c7463e0cb4f7ef51b6c88dde5) --- contrib/fedora/rpm/NetworkManager.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/fedora/rpm/NetworkManager.spec b/contrib/fedora/rpm/NetworkManager.spec index 6701d90098..67402162df 100644 --- a/contrib/fedora/rpm/NetworkManager.spec +++ b/contrib/fedora/rpm/NetworkManager.spec @@ -24,8 +24,8 @@ %global obsoletes_device_plugins 1:0.9.9.95-1 %global obsoletes_ppp_plugin 1:1.5.3 -%global obsoletes_initscripts_updown 1:1.35.4 -%global obsoletes_ifcfg_rh 1:1.37.1 +%global obsoletes_initscripts_updown 1:1.36.0-0.6 +%global obsoletes_ifcfg_rh 1:1.36.2 %global nmlibdir %{_prefix}/lib/%{name} %global nmplugindir %{_libdir}/%{name}/%{version}-%{release}