From 142dda9ac254e8907de316654c683ff52ec6a5e4 Mon Sep 17 00:00:00 2001
From: DistroBaker <osci-list@redhat.com>
Date: Wed, 17 Feb 2021 19:10:25 +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/cairomm.git#83d3ed9f4c6be5da6073ea58f5930a8887e3fa66
---
 cairomm.spec | 42 +++++++++++++++++++++++++-----------------
 1 file changed, 25 insertions(+), 17 deletions(-)

diff --git a/cairomm.spec b/cairomm.spec
index ce6fc1b..0c81f4e 100644
--- a/cairomm.spec
+++ b/cairomm.spec
@@ -9,7 +9,7 @@
 Name:           cairomm
 Summary:        C++ API for the cairo graphics library
 Version:        1.14.2
-Release:        5%{?dist}
+Release:        6%{?dist}
 
 URL:            https://www.cairographics.org
 License:        LGPLv2+
@@ -28,13 +28,27 @@ Source2:        %{src_base}/%{name}-%{version}.tar.xz.sha1.asc
 # BuildRequires:  gnupg2
 
 BuildRequires:  gcc-c++
-BuildRequires:  make
-BuildRequires:  pkgconfig
-
 BuildRequires:  meson
 
+BuildRequires:  pkgconfig(cairo)
+BuildRequires:  pkgconfig(sigc++-2.0)
+BuildRequires:  pkgconfig(fontconfig)
+
+# Everything mentioned in data/cairomm*.pc.in, except the Quartz and Win32
+# libraries that do not apply to this platform:
+BuildRequires:  pkgconfig(cairo-ft)
+BuildRequires:  pkgconfig(cairo-pdf)
+BuildRequires:  pkgconfig(cairo-png)
+BuildRequires:  pkgconfig(cairo-ps)
+BuildRequires:  pkgconfig(cairo-svg)
+BuildRequires:  pkgconfig(cairo-xlib)
+BuildRequires:  pkgconfig(cairo-xlib-xrender)
+
+%if %{with maintainer_mode}
 # mm-common-get
 BuildRequires:  mm-common
+%endif
+
 BuildRequires:  perl-interpreter
 BuildRequires:  perl(Getopt::Long)
 BuildRequires:  doxygen
@@ -42,20 +56,10 @@ BuildRequires:  doxygen
 BuildRequires:  graphviz
 # xsltproc
 BuildRequires:  libxslt
+BuildRequires:  pkgconfig(mm-common-libstdc++)
 
 # For tests:
 BuildRequires:  boost-devel
-BuildRequires:  fontconfig
-BuildRequires:  pkgconfig(cairo-ft)
-BuildRequires:  pkgconfig(cairo-pdf)
-BuildRequires:  pkgconfig(cairo-png)
-BuildRequires:  pkgconfig(cairo-ps)
-
-BuildRequires:  pkgconfig(cairo-svg)
-BuildRequires:  pkgconfig(cairo-xlib)
-BuildRequires:  pkgconfig(cairo-xlib-xrender)
-BuildRequires:  pkgconfig(mm-common-libstdc++)
-BuildRequires:  pkgconfig(sigc++-2.0)
 
 # Based on discussion in
 # https://src.fedoraproject.org/rpms/pangomm/pull-request/2, cairomm will
@@ -63,7 +67,7 @@ BuildRequires:  pkgconfig(sigc++-2.0)
 # package providing the new 1.16 API/ABI series. This virtual Provides is
 # therefore no longer required, as dependent packages requiring the 1.0 API/ABI
 # may safely require cairomm and its subpackages.
-Provides:       %{name}%{apiver}%{_?isa} = %{version}-%{release}
+Provides:       %{name}%{apiver}%{?_isa} = %{version}-%{release}
 
 %description
 This library provides a C++ interface to cairo.
@@ -73,7 +77,7 @@ This library provides a C++ interface to cairo.
 Summary:        Development files for %{name}
 Requires:       %{name}%{?_isa} = %{version}-%{release}
 
-Provides:       %{name}%{apiver}-devel%{_?isa} = %{version}-%{release}
+Provides:       %{name}%{apiver}-devel%{?_isa} = %{version}-%{release}
 
 %description    devel
 The %{name}-devel package contains libraries and header files for developing
@@ -158,6 +162,10 @@ cp -rp examples %{buildroot}%{_datadir}/doc/%{name}-%{apiver}/
 
 
 %changelog
+* Wed Feb 17 2021 Benjamin A. Beasley <code@musicinmybrain.net> - 1.14.2-6
+- Fix typo %%{_?isa} for %%{?_isa} in virtual Provides
+- Tidy up BR’s, including dropping make
+
 * Mon Feb 15 2021 Benjamin A. Beasley <code@musicinmybrain.net> - 1.14.2-5
 - Update comments based on the new plan for the version 1.16 API/ABI