From 60612978613cd0f16c8391c11c4772f878ab451f Mon Sep 17 00:00:00 2001
From: DistroBaker <osci-list@redhat.com>
Date: Tue, 2 Feb 2021 23:36:43 +0000
Subject: [PATCH] Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/mingw-pkg-config.git#971b01543842caf2967b9c3c3f64cc76adf7ed89
---
 mingw-pkg-config.spec | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/mingw-pkg-config.spec b/mingw-pkg-config.spec
index ba096b9..7a62325 100644
--- a/mingw-pkg-config.spec
+++ b/mingw-pkg-config.spec
@@ -1,12 +1,13 @@
 Name:           mingw-pkg-config
 Version:        0.28
-Release:        15%{?dist}
+Release:        16%{?dist}
 Summary:        A tool for determining compilation options
 
 License:        GPLv2+
 URL:            http://pkgconfig.freedesktop.org
 Source0:        http://www.freedesktop.org/software/pkgconfig/releases/pkg-config-%{version}.tar.gz
 
+BuildRequires: make
 BuildRequires:  gcc
 BuildRequires:  glib2-devel
 BuildRequires:  mingw32-filesystem >= 95
@@ -41,7 +42,7 @@ compiler and linker flags.
 
 
 %prep
-%setup -q -n pkg-config-%{version}
+%autosetup -p1 -n pkg-config-%{version}
 
 
 %build
@@ -55,7 +56,7 @@ pushd build_win32
         --program-prefix=%{mingw32_target}- \
         --with-pc-path=%{mingw32_libdir}/pkgconfig:%{mingw32_datadir}/pkgconfig
 
-    make %{?_smp_mflags}
+    %make_build
 popd
 
 mkdir build_win64
@@ -66,31 +67,36 @@ pushd build_win64
         --program-prefix=%{mingw64_target}- \
         --with-pc-path=%{mingw64_libdir}/pkgconfig:%{mingw64_datadir}/pkgconfig
 
-    make %{?_smp_mflags}
+    %make_build
 popd
 
 
 %install
-make install -C build_win32 DESTDIR=$RPM_BUILD_ROOT
-make install -C build_win64 DESTDIR=$RPM_BUILD_ROOT
+%make_install -C build_win32
+%make_install -C build_win64
 
 # These files conflict with ordinary pkg-config.
-rm -rf ${RPM_BUILD_ROOT}%{_datadir}/aclocal
-rm -rf ${RPM_BUILD_ROOT}%{_datadir}/doc/pkg-config
+rm -rf %{buildroot}%{_datadir}/aclocal
+rm -rf %{buildroot}%{_datadir}/doc/pkg-config
 
 
 %files -n mingw32-pkg-config
-%doc AUTHORS README NEWS COPYING pkg-config-guide.html
+%license COPYING
+%doc AUTHORS README NEWS pkg-config-guide.html
 %{_bindir}/%{mingw32_target}-pkg-config
 %{_mandir}/man1/%{mingw32_target}-pkg-config.1*
 
 %files -n mingw64-pkg-config
-%doc AUTHORS README NEWS COPYING pkg-config-guide.html
+%license COPYING
+%doc AUTHORS README NEWS pkg-config-guide.html
 %{_bindir}/%{mingw64_target}-pkg-config
 %{_mandir}/man1/%{mingw64_target}-pkg-config.1*
 
 
 %changelog
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.28-16
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
 * Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.28-15
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild