From 46bcabfaaca9bf961ea47d825121c2061f669c82 Mon Sep 17 00:00:00 2001
From: DistroBaker <osci-list@redhat.com>
Date: Tue, 15 Dec 2020 11:05:50 +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/pangomm.git#535cb0d6ae690be25b4dbb3c8a78d7de21380292
---
 .gitignore   |  1 +
 pangomm.spec | 38 ++++++++++++++++++++++----------------
 sources      |  2 +-
 3 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1c5246a..f6197e5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@ pangomm-2.26.2.tar.bz2
 /pangomm-2.40.1.tar.xz
 /pangomm-2.40.2.tar.xz
 /pangomm-2.42.1.tar.xz
+/pangomm-2.42.2.tar.xz
diff --git a/pangomm.spec b/pangomm.spec
index 28f78f3..7136274 100644
--- a/pangomm.spec
+++ b/pangomm.spec
@@ -7,19 +7,24 @@
 %global pango_version 1.41.0
 
 Name:           pangomm
-Version:        2.42.1
-Release:        2%{?dist}
+Version:        2.42.2
+Release:        1%{?dist}
 Summary:        C++ interface for Pango
 
 License:        LGPLv2+
-URL:            http://www.gtkmm.org/
-Source0:        http://ftp.gnome.org/pub/GNOME/sources/pangomm/%{release_version}/%{name}-%{version}.tar.xz
+URL:            https://www.gtkmm.org/
+Source0:        https://download.gnome.org/sources/pangomm/%{release_version}/%{name}-%{version}.tar.xz
 
+BuildRequires:  cairomm-devel >= %{cairomm_version}
+BuildRequires:  doxygen
 BuildRequires:  gcc-c++
 BuildRequires:  glibmm24-devel >= %{glibmm_version}
-BuildRequires:  cairomm-devel >= %{cairomm_version}
+BuildRequires:  libxslt
+BuildRequires:  m4
+BuildRequires:  meson
+BuildRequires:  meson
+BuildRequires:  mm-common
 BuildRequires:  pango-devel >= %{pango_version}
-BuildRequires:  doxygen graphviz
 
 Requires:       glibmm24%{?_isa} >= %{glibmm_version}
 Requires:       cairomm%{?_isa} >= %{cairomm_version}
@@ -60,28 +65,23 @@ documentation browser or through a web browser.
 
 
 %build
-%configure --disable-static
-make %{?_smp_mflags}
+%meson -Dbuild-documentation=true
+%meson_build
 
 
 %install
-%make_install
-
-find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
-
-
-%ldconfig_scriptlets
+%meson_install
 
 
 %files
 %license COPYING
 %doc AUTHORS NEWS README
-%{_libdir}/*.so.*
+%{_libdir}/libpangomm-%{apiver}.so.1*
 
 
 %files devel
 %{_includedir}/pangomm-%{apiver}
-%{_libdir}/*.so
+%{_libdir}/libpangomm-%{apiver}.so
 %{_libdir}/pkgconfig/*.pc
 %{_libdir}/pangomm-%{apiver}
 
@@ -90,6 +90,12 @@ find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 %{_datadir}/devhelp/
 
 %changelog
+* Mon Dec 14 2020 Kalev Lember <klember@redhat.com> - 2.42.2-1
+- Update to 2.42.2
+- Update source URLs
+- Switch to meson build system
+- Tighten soname globs
+
 * Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.42.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 
diff --git a/sources b/sources
index 9060f62..c8d19d8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (pangomm-2.42.1.tar.xz) = 46ba375e61dd32e268397ecb8e69364b642ea3d9a6c4d9e3e52500e1e1c9fa0c6aa822c6d5046f49a2fe4d9a872c6c2b354134d39c17370abcfc6a1d752223b0
+SHA512 (pangomm-2.42.2.tar.xz) = 5e4826d64c0178527b4df73e901d2fdf5661d41777e189f5e2d4b26577e42689efaccf5a28502246c6b3926571ccd5876cb23d33267b44ace7ee164322c14667