From b91accf9ac531c70704abb9e7c02ead59060329b8d0c65518242879e796ac63b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= <bjorn.lie@gmail.com>
Date: Tue, 7 Dec 2021 10:20:25 +0000
Subject: [PATCH] Accepting request 935835 from GNOME:Next

- Update to version 2.48.2:
  * NMake Makefiles: Correct VS2019 toolset number
  * build: Support Visual Studio 2022 builds
  * Don't include individual pango headers, part 2
  * Don't include individual pango headers
  * Use pango from the main branch
- Switch to using a gitcheckout via source service. Pass
  maintainer-mode=true to meson and add m4, mm-common and
  perl(XML::Parser) BuildRequires, as this is needed with a
  git-checkout.

OBS-URL: https://build.opensuse.org/request/show/935835
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/pangomm?expand=0&rev=76
---
 _service               | 20 ++++++++++++++++++++
 _servicedata           |  4 ++++
 pangomm-2.48.1.tar.xz  |  3 ---
 pangomm-2.48.2.obscpio |  3 +++
 pangomm.changes        | 14 ++++++++++++++
 pangomm.obsinfo        |  5 +++++
 pangomm.spec           | 11 +++++++++--
 7 files changed, 55 insertions(+), 5 deletions(-)
 create mode 100644 _service
 create mode 100644 _servicedata
 delete mode 100644 pangomm-2.48.1.tar.xz
 create mode 100644 pangomm-2.48.2.obscpio
 create mode 100644 pangomm.obsinfo

diff --git a/_service b/_service
new file mode 100644
index 0000000..a27c36f
--- /dev/null
+++ b/_service
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<services>
+  <service name="obs_scm" mode="disabled">
+    <param name="scm">git</param>
+    <param name="url">https://gitlab.gnome.org/GNOME/pangomm.git</param>
+    <param name="revision">2.48.2</param>
+    <param name="versionformat">@PARENT_TAG@+@TAG_OFFSET@</param>
+    <param name="versionrewrite-pattern">(.*)\+0</param>
+    <param name="versionrewrite-replacement">\1</param>
+    <param name="changesgenerate">enable</param>
+  </service>
+  <service name="tar" mode="buildtime"/>
+  <service name="recompress" mode="buildtime">
+    <param name="file">*.tar</param>
+    <param name="compression">xz</param>
+  </service>
+  <service name="set_version" mode="disabled" />
+</services>
+
+
diff --git a/_servicedata b/_servicedata
new file mode 100644
index 0000000..8bd3515
--- /dev/null
+++ b/_servicedata
@@ -0,0 +1,4 @@
+<servicedata>
+<service name="tar_scm">
+                <param name="url">https://gitlab.gnome.org/GNOME/pangomm.git</param>
+              <param name="changesrevision">a801d44602b1c41e485050caf8c83f5931504acd</param></service></servicedata>
\ No newline at end of file
diff --git a/pangomm-2.48.1.tar.xz b/pangomm-2.48.1.tar.xz
deleted file mode 100644
index 5dd92a1..0000000
--- a/pangomm-2.48.1.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:776ad53e791e43106b7f40ff0834bee6e4eb1c6ad7cb6d215546f7a3df0edc4d
-size 675452
diff --git a/pangomm-2.48.2.obscpio b/pangomm-2.48.2.obscpio
new file mode 100644
index 0000000..3504b8c
--- /dev/null
+++ b/pangomm-2.48.2.obscpio
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:375027d1e54d30c1c64709f76e4e5bce3e595648ca208b3c09d29ed49569bede
+size 992780
diff --git a/pangomm.changes b/pangomm.changes
index 7c4338f..b9e64ed 100644
--- a/pangomm.changes
+++ b/pangomm.changes
@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Sun Dec 05 17:44:57 UTC 2021 - bjorn.lie@gmail.com
+
+- Update to version 2.48.2:
+  * NMake Makefiles: Correct VS2019 toolset number
+  * build: Support Visual Studio 2022 builds
+  * Don't include individual pango headers, part 2
+  * Don't include individual pango headers
+  * Use pango from the main branch
+- Switch to using a gitcheckout via source service. Pass
+  maintainer-mode=true to meson and add m4, mm-common and
+  perl(XML::Parser) BuildRequires, as this is needed with a
+  git-checkout.
+
 -------------------------------------------------------------------
 Tue Sep 28 15:06:30 UTC 2021 - Bjørn Lie <bjorn.lie@gmail.com>
 
diff --git a/pangomm.obsinfo b/pangomm.obsinfo
new file mode 100644
index 0000000..ef18492
--- /dev/null
+++ b/pangomm.obsinfo
@@ -0,0 +1,5 @@
+name: pangomm
+version: 2.48.2
+mtime: 1638725508
+commit: a801d44602b1c41e485050caf8c83f5931504acd
+
diff --git a/pangomm.spec b/pangomm.spec
index e8c4eff..e2eebd3 100644
--- a/pangomm.spec
+++ b/pangomm.spec
@@ -21,13 +21,15 @@
 %define libname  lib%{name}-2_48-1
 
 Name:           pangomm
-Version:        2.48.1
+Version:        2.48.2
 Release:        0
 Summary:        C++ interface for pango
 License:        GPL-2.0-or-later AND LGPL-2.1-or-later AND GPL-3.0-only
 Group:          Development/Libraries/C and C++
 URL:            https://www.gtkmm.org
-Source0:        https://download.gnome.org/sources/%{name}/%{base_ver}/%{name}-%{version}.tar.xz
+# Source0 disabled, we are using source service
+#Source0:        https://download.gnome.org/sources/%%{name}/%%{base_ver}/%%{name}-%%{version}.tar.xz
+Source0:        %{name}-%{version}.tar.xz
 Source99:       baselibs.conf
 # PATCH-FIX-UPSTREAM pangomm-docs-without-timestamp.patch -- Do not add timestamp to generated doc files.
 Patch0:         pangomm-docs-without-timestamp.patch
@@ -37,8 +39,12 @@ BuildRequires:  doxygen
 BuildRequires:  fdupes
 BuildRequires:  graphviz
 BuildRequires:  meson
+# m4, mm-common and perl(XML::Parser) only needed due to git-checkout
+BuildRequires:  m4
+BuildRequires:  mm-common
 BuildRequires:  pkgconfig
 BuildRequires:  xsltproc
+BuildRequires:  perl(XML::Parser)
 BuildRequires:  pkgconfig(cairomm-1.16) >= 1.2.2
 BuildRequires:  pkgconfig(giomm-2.68)
 BuildRequires:  pkgconfig(glibmm-2.68)
@@ -80,6 +86,7 @@ chmod -x NEWS
 
 %build
 %meson \
+	-Dmaintainer-mode=true \
 	-Dbuild-documentation=true \
 	%{nil}
 %meson_build