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

Fix Obsoletes and Conflicts to prevent self-conflicts

Browse Source
This commit is contained in:
Neal Gompa 2017-02-02 11:21:28 -05:00
parent 271aa920cb
commit 17a55058a0
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgconf.spec
View File

@ -8,7 +8,7 @@
%if %{with pkgconfig_compat} %if %{with pkgconfig_compat}
%global pkgconfig_ver 0.29.1 %global pkgconfig_ver 0.29.1
# For obsoleting pkgconfig # For obsoleting pkgconfig
%global pkgconfig_verrel %{pkgconfig_ver}-2 %global pkgconfig_verrel %{pkgconfig_ver}-3
%global pkgconfig_evr 1:%{pkgconfig_verrel} %global pkgconfig_evr 1:%{pkgconfig_verrel}
%endif %endif
@ -64,8 +64,8 @@ Summary: m4 macros for pkgconf
License: GPLv2+ with exceptions License: GPLv2+ with exceptions
BuildArch: noarch BuildArch: noarch
# Ensure that it Conflicts and Obsoletes pkgconfig since it contains content formerly from it # Ensure that it Conflicts and Obsoletes pkgconfig since it contains content formerly from it
Conflicts: pkgconfig <= %{pkgconfig_evr} Conflicts: pkgconfig < %{pkgconfig_evr}
Obsoletes: pkgconfig <= %{pkgconfig_evr} Obsoletes: pkgconfig < %{pkgconfig_evr}
%description m4 %description m4
This package includes m4 macros used to support PKG_CHECK_MODULES This package includes m4 macros used to support PKG_CHECK_MODULES
@ -74,8 +74,8 @@ when using pkgconf with autotools.
%package pkg-config %package pkg-config
Summary: %{name} shim to provide /usr/bin/pkg-config Summary: %{name} shim to provide /usr/bin/pkg-config
# Ensure that it Conflicts with pkgconfig and is considered "better" # Ensure that it Conflicts with pkgconfig and is considered "better"
Conflicts: pkgconfig <= %{pkgconfig_evr} Conflicts: pkgconfig < %{pkgconfig_evr}
Obsoletes: pkgconfig <= %{pkgconfig_evr} Obsoletes: pkgconfig < %{pkgconfig_evr}
Provides: pkgconfig = %{pkgconfig_evr} Provides: pkgconfig = %{pkgconfig_evr}
Provides: pkgconfig%{?_isa} = %{pkgconfig_evr} Provides: pkgconfig%{?_isa} = %{pkgconfig_evr}
# This is in the original pkgconfig package, set to match output from pkgconf # This is in the original pkgconfig package, set to match output from pkgconf
@ -165,6 +165,9 @@ rm -rf %{buildroot}%{_datadir}/aclocal
%endif %endif
%changelog %changelog
* Thu Feb 02 2017 Neal Gompa <ngompa13@gmail.com> - 1.2.1-3
- Fix Obsoletes and Conflicts to prevent self-conflicts
* Thu Feb 02 2017 Neal Gompa <ngompa13@gmail.com> - 1.2.1-2 * Thu Feb 02 2017 Neal Gompa <ngompa13@gmail.com> - 1.2.1-2
- Adjust Obsoletes and Conflicts to use inclusive range - Adjust Obsoletes and Conflicts to use inclusive range