From 17a55058a02d038efc739d2a8377a5103150f185 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Thu, 2 Feb 2017 11:21:28 -0500 Subject: [PATCH] Fix Obsoletes and Conflicts to prevent self-conflicts --- pkgconf.spec | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgconf.spec b/pkgconf.spec index 58535db..52d74e8 100644 --- a/pkgconf.spec +++ b/pkgconf.spec @@ -8,7 +8,7 @@ %if %{with pkgconfig_compat} %global pkgconfig_ver 0.29.1 # For obsoleting pkgconfig -%global pkgconfig_verrel %{pkgconfig_ver}-2 +%global pkgconfig_verrel %{pkgconfig_ver}-3 %global pkgconfig_evr 1:%{pkgconfig_verrel} %endif @@ -64,8 +64,8 @@ Summary: m4 macros for pkgconf License: GPLv2+ with exceptions BuildArch: noarch # Ensure that it Conflicts and Obsoletes pkgconfig since it contains content formerly from it -Conflicts: pkgconfig <= %{pkgconfig_evr} -Obsoletes: pkgconfig <= %{pkgconfig_evr} +Conflicts: pkgconfig < %{pkgconfig_evr} +Obsoletes: pkgconfig < %{pkgconfig_evr} %description m4 This package includes m4 macros used to support PKG_CHECK_MODULES @@ -74,8 +74,8 @@ when using pkgconf with autotools. %package pkg-config Summary: %{name} shim to provide /usr/bin/pkg-config # Ensure that it Conflicts with pkgconfig and is considered "better" -Conflicts: pkgconfig <= %{pkgconfig_evr} -Obsoletes: pkgconfig <= %{pkgconfig_evr} +Conflicts: pkgconfig < %{pkgconfig_evr} +Obsoletes: pkgconfig < %{pkgconfig_evr} Provides: pkgconfig = %{pkgconfig_evr} Provides: pkgconfig%{?_isa} = %{pkgconfig_evr} # This is in the original pkgconfig package, set to match output from pkgconf @@ -165,6 +165,9 @@ rm -rf %{buildroot}%{_datadir}/aclocal %endif %changelog +* Thu Feb 02 2017 Neal Gompa - 1.2.1-3 +- Fix Obsoletes and Conflicts to prevent self-conflicts + * Thu Feb 02 2017 Neal Gompa - 1.2.1-2 - Adjust Obsoletes and Conflicts to use inclusive range