From 17e4ff0cb886519000f84f2ac1d3250bbf8fd083 Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Mon, 15 Feb 2021 08:55:57 -0500
Subject: [PATCH] Revert "Update to 1.16.0, introducing API/ABI version 1.16;
 the previous API/ABI version 1.0 is now provided by cairomm1.0 and its
 subpackages"

This reverts commit 5aa2c20a7352d1d47d64ca0c524e937cd9735d65.

Change of plans: keep cairomm on the 1.0 API/ABI and add a cairomm1.16 package for the new API/ABI instead. See https://src.fedoraproject.org/rpms/pangomm/pull-request/2 for discussion.

Note that the reverted commit was only built in a side-tag.
---
 cairomm.spec | 26 +++++++++++++-------------
 sources      |  6 +++---
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/cairomm.spec b/cairomm.spec
index 9c7e11b..73bff27 100644
--- a/cairomm.spec
+++ b/cairomm.spec
@@ -1,5 +1,5 @@
 %global so_version 1
-%global apiver 1.16
+%global apiver 1.0
 
 # “Let mm-common-get copy some files to untracked/”, i.e., replace scripts from
 # the tarball with those from mm-common. This is (potentially) required if
@@ -8,8 +8,8 @@
 
 Name:           cairomm
 Summary:        C++ API for the cairo graphics library
-Version:        1.16.0
-Release:        1%{?dist}
+Version:        1.14.2
+Release:        4%{?dist}
 
 URL:            https://www.cairographics.org
 License:        LGPLv2+
@@ -55,11 +55,13 @@ BuildRequires:  pkgconfig(cairo-svg)
 BuildRequires:  pkgconfig(cairo-xlib)
 BuildRequires:  pkgconfig(cairo-xlib-xrender)
 BuildRequires:  pkgconfig(mm-common-libstdc++)
-BuildRequires:  pkgconfig(sigc++-3.0)
+BuildRequires:  pkgconfig(sigc++-2.0)
 
-# In case of a future new ABI/API, the current ABI/ABI can be maintained in a
-# package with this name; the virtual Provides can offer continuity for any
-# dependent packages that do not solely use pkgconfig().
+# Prepare for future upgrade to API/ABI version 1.16 by introducing a name for
+# API/ABI version 1.0. Dependent packages using pkg-config will not need to
+# care; those that depend on this package by name, however, will need to be
+# updated to require the versioned name. This name is chosen in accordance with
+# https://docs.fedoraproject.org/en-US/packaging-guidelines/Naming/#multiple.
 Provides:       %{name}%{apiver}%{_?isa} = %{version}-%{release}
 
 %description
@@ -81,7 +83,7 @@ applications that use %{name}.
 Summary:        Documentation for %{name}
 BuildArch:      noarch
 Requires:       libstdc++-docs
-Requires:       libsigc++30-doc
+Requires:       libsigc++20-doc
 
 Provides:       %{name}%{apiver}-doc = %{version}-%{release}
 
@@ -105,7 +107,9 @@ popd
 # different license.) We also remove the tag file, which triggers a rebuild of
 # the documentation. While we are at it, we might as well rebuild the devhelp
 # XML too.
-rm -rf untracked/docs/reference
+rm -rf untracked/docs/reference/html
+rm untracked/docs/reference/%{name}-%{apiver}.tag \
+   untracked/docs/reference/%{name}-%{apiver}.devhelp2
 
 
 %build
@@ -153,10 +157,6 @@ cp -rp examples %{buildroot}%{_datadir}/doc/%{name}-%{apiver}/
 
 
 %changelog
-* Fri Feb 12 2021 Benjamin A. Beasley <code@musicinmybrain.net> - 1.16.0-1
-- Update to 1.16.0, introducing API/ABI version 1.16; the previous API/ABI
-  version 1.0 is now provided by cairomm1.0 and its subpackages
-
 * Thu Feb 11 2021 Benjamin A. Beasley <code@musicinmybrain.net> - 1.14.2-4
 - Prepare for future upgrade to API/ABI version 1.16 by introducing virtual
   Provides for a name for API/ABI version 1.0: cairomm1.0. This will be the name
diff --git a/sources b/sources
index 61fa73a..b4ebc36 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (cairomm-1.16.0.tar.xz) = 51929620feeac45377da5d486ea7a091bbd10ad8376fb16525328947b9e6ee740cdc8e8bd190a247b457cc9fec685a829c81de29b26cabaf95383ef04cce80d3
-SHA512 (cairomm-1.16.0.tar.xz.sha1) = 3c33c3fde4857fc2977698e46997c33051814550607c9fb8e024a029ef7b5167d9a5991ef26f716c2df296e2648b1784614ee9ef198b71da4df6dcdefb20c605
-SHA512 (cairomm-1.16.0.tar.xz.sha1.asc) = f26e421b393da03de6874af08dab34e89dda42ccf7a4de91609b78443918aa86968a1a8dd726caaedc0b06eb12433c49f271097fb8c9a0461a06c2db406fa585
+SHA512 (cairomm-1.14.2.tar.xz) = aef374fca25ad22770407e36512046b266d71ebeccd47fb629cfbf2f67783aa314bb335b972088a88d98417a4774d6f144cd2769c452f8aa23770eae08dca592
+SHA512 (cairomm-1.14.2.tar.xz.sha1) = 045fcd7380a2c63866edd10539a1daae6f36a22614b9fffaad60ea32a82b0ca221ba56596edf357d820cfe0880513ef61cb8bd34077e73bb94e51981b826bfd2
+SHA512 (cairomm-1.14.2.tar.xz.sha1.asc) = 992f2ab7be68ce7570ba49efa40cc12cc2d2ed13983127892f1335401a184f3cb35e1a4b422d7ff0d234a0085bbc0dac9c84f183133f40ac47e668fb6d21f3c6