Fix file conflicts with mingw-pkg-config
Related: rhbz#2031784 Signed-off-by: Konstantin Kostiuk <kkostiuk@redhat.com>
This commit is contained in:
parent
f3edf317b0
commit
a53cf1735c
@ -7,7 +7,7 @@
|
||||
|
||||
Name: mingw-filesystem
|
||||
Version: 119
|
||||
Release: 2%{?dist}
|
||||
Release: 3%{?dist}
|
||||
Summary: MinGW cross compiler base filesystem and environment
|
||||
|
||||
License: GPLv2+
|
||||
@ -84,9 +84,9 @@ This environment is maintained by the Fedora MinGW SIG at:
|
||||
Summary: MinGW cross compiler base filesystem and environment for the win32 target
|
||||
Requires: %{name}-base = %{version}-%{release}
|
||||
# Replace mingw32-pkg-config
|
||||
Conflicts: mingw32-pkg-config < 0.28-17
|
||||
Obsoletes: mingw32-pkg-config < 0.28-17
|
||||
Provides: mingw32-pkg-config = 0.28-17
|
||||
Conflicts: mingw32-pkg-config < 0.28-18
|
||||
Obsoletes: mingw32-pkg-config < 0.28-18
|
||||
Provides: mingw32-pkg-config = 0.28-18
|
||||
|
||||
# Note about 'Provides: mingw32(foo.dll)'
|
||||
# ------------------------------------------------------------
|
||||
@ -118,9 +118,9 @@ This environment is maintained by the Fedora MinGW SIG at:
|
||||
Summary: MinGW cross compiler base filesystem and environment for the win64 target
|
||||
Requires: %{name}-base = %{version}-%{release}
|
||||
# Replace mingw64-pkg-config
|
||||
Conflicts: mingw64-pkg-config < 0.28-17
|
||||
Obsoletes: mingw64-pkg-config < 0.28-17
|
||||
Provides: mingw64-pkg-config = 0.28-17
|
||||
Conflicts: mingw64-pkg-config < 0.28-18
|
||||
Obsoletes: mingw64-pkg-config < 0.28-18
|
||||
Provides: mingw64-pkg-config = 0.28-18
|
||||
|
||||
Provides: %(sed "s/\(.*\)/mingw64(\1) /g" %{SOURCE17} | tr "\n" " ")
|
||||
Provides: mingw64(mscoree.dll)
|
||||
@ -353,6 +353,10 @@ echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/x86_64-w64-mingw32-pkg-c
|
||||
|
||||
|
||||
%changelog
|
||||
* Sat Apr 23 2022 Konstantin Kostiuk <kkostiuk@redhat.com>
|
||||
- Fix file conflicts with mingw-pkg-config
|
||||
Related: rhbz#2031784
|
||||
|
||||
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com>
|
||||
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
||||
Related: rhbz#1991688
|
||||
|
Loading…
Reference in New Issue
Block a user