From b85b8ed6fa6c664fc3cf0472234a5fe9384011e0 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 20 Jan 2017 15:08:19 +0100 Subject: [PATCH] contrib/rpm: let NetworkManager-libnm and NetworkManager-glib of differing version conflict Since commit "c920909 contrib/rpm: put translations in NetworkManager-libnm and NetworkManager-glib packages", both subpackages install the same translation files without a direct dependency between the two packages. Thus, if a user tries to update only one of the two subpackages, it will fail during the installation due to conflicting files. Fix that by having the subpackages conflict (per version). This way, the conflict is detected before starting the installation. https://bugzilla.redhat.com/show_bug.cgi?id=1406454 --- contrib/fedora/rpm/NetworkManager.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contrib/fedora/rpm/NetworkManager.spec b/contrib/fedora/rpm/NetworkManager.spec index 12d97c37d7..b3850b615b 100644 --- a/contrib/fedora/rpm/NetworkManager.spec +++ b/contrib/fedora/rpm/NetworkManager.spec @@ -272,6 +272,7 @@ Summary: Libraries for adding NetworkManager support to applications (old API). Group: Development/Libraries Requires: dbus >= %{dbus_version} Requires: dbus-glib >= %{dbus_glib_version} +Conflicts: NetworkManager-libnm < %{epoch}:%{version}-%{release} %description glib This package contains the libraries that make it easier to use some @@ -300,6 +301,7 @@ This is the older NetworkManager API. See also NetworkManager-libnm-devel. %package libnm Summary: Libraries for adding NetworkManager support to applications (new API). Group: Development/Libraries +Conflicts: NetworkManager-glib < %{epoch}:%{version}-%{release} %description libnm This package contains the libraries that make it easier to use some