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

Adjust Obsoletes and Conflicts to use inclusive range

Browse Source
This commit is contained in:
Neal Gompa 2017-02-02 07:20:22 -05:00
parent 8e240c9da6
commit 271aa920cb
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkgconf.spec
View File

@ -1,4 +1,4 @@
# pkgconf can acts as pkgconfig for F26+
# pkgconf acts as pkgconfig for F26+
%if 0%{?fedora} >= 26
%bcond_without pkgconfig_compat
%else
@ -14,7 +14,7 @@
Name: pkgconf
Version: 1.2.1
Release: 1%{?dist}
Release: 2%{?dist}
Summary: Package compiler and linker metadata toolkit
License: ISC
@ -63,10 +63,9 @@ to use functionality provided by %{name}.
Summary: m4 macros for pkgconf
License: GPLv2+ with exceptions
BuildArch: noarch
# FIXME: Somehow get rid of the file conflict between pkgconfig and pkgconf-m4
Conflicts: pkgconfig < %{pkgconfig_evr}
# Ensure that it Obsoletes pkgconfig since it contains content formerly from it
Obsoletes: pkgconfig < %{pkgconfig_evr}
# Ensure that it Conflicts and Obsoletes pkgconfig since it contains content formerly from it
Conflicts: pkgconfig <= %{pkgconfig_evr}
Obsoletes: pkgconfig <= %{pkgconfig_evr}
%description m4
This package includes m4 macros used to support PKG_CHECK_MODULES
@ -75,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
@ -166,6 +165,9 @@ rm -rf %{buildroot}%{_datadir}/aclocal
%endif
%changelog
* Thu Feb 02 2017 Neal Gompa <ngompa13@gmail.com> - 1.2.1-2
- Adjust Obsoletes and Conflicts to use inclusive range
* Tue Jan 24 2017 Igor Gnatenko <ignatenko@redhat.com> - 1.2.1-1
- Update to 1.2.1