From 2a3e1e15172182e16bc0b41fe04e83c059c5a093f1554a033b1daacb3b73ce37 Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndirsch@suse.com>
Date: Sun, 7 Apr 2024 19:12:28 +0000
Subject: [PATCH 1/2] - Update to version 1.12.1   * This release includes
 support for building with meson as well     as autoconf. - switched to meson
 build

OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-sgml-doctools?expand=0&rev=10
---
 xorg-sgml-doctools-1.12.1.tar.xz |  3 +++
 xorg-sgml-doctools-1.12.tar.bz2  |  3 ---
 xorg-sgml-doctools.changes       |  8 ++++++++
 xorg-sgml-doctools.spec          | 18 +++++++-----------
 4 files changed, 18 insertions(+), 14 deletions(-)
 create mode 100644 xorg-sgml-doctools-1.12.1.tar.xz
 delete mode 100644 xorg-sgml-doctools-1.12.tar.bz2

diff --git a/xorg-sgml-doctools-1.12.1.tar.xz b/xorg-sgml-doctools-1.12.1.tar.xz
new file mode 100644
index 0000000..8a9ad96
--- /dev/null
+++ b/xorg-sgml-doctools-1.12.1.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0a5d54c0706b4e89d5acd4d455db3745ab4ad26be627cce015b90ad403b56d6f
+size 107832
diff --git a/xorg-sgml-doctools-1.12.tar.bz2 b/xorg-sgml-doctools-1.12.tar.bz2
deleted file mode 100644
index eddada1..0000000
--- a/xorg-sgml-doctools-1.12.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:65a9fdddedc17bd5e9c0b00d904960f03f047c3a62de5458989d493c29fec806
-size 131356
diff --git a/xorg-sgml-doctools.changes b/xorg-sgml-doctools.changes
index 5acf8a9..366493d 100644
--- a/xorg-sgml-doctools.changes
+++ b/xorg-sgml-doctools.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Sun Apr  7 19:02:50 UTC 2024 - Stefan Dirsch <sndirsch@suse.com>
+
+- Update to version 1.12.1
+  * This release includes support for building with meson as well
+    as autoconf.
+- switched to meson build
+
 -------------------------------------------------------------------
 Mon Apr  4 10:35:57 UTC 2022 - Stefan Dirsch <sndirsch@suse.com>
 
diff --git a/xorg-sgml-doctools.spec b/xorg-sgml-doctools.spec
index 357e1f8..5ee7734 100644
--- a/xorg-sgml-doctools.spec
+++ b/xorg-sgml-doctools.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package xorg-sgml-doctools
 #
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,17 +17,14 @@
 
 
 Name:           xorg-sgml-doctools
-Version:        1.12
+Version:        1.12.1
 Release:        0
 Summary:        Set of SGML entities and XML/CSS style sheets for building X.org documentation
 License:        MIT
 Group:          Development/Tools/Building
 URL:            http://xorg.freedesktop.org/
-Source0:        http://xorg.freedesktop.org/releases/individual/doc/%{name}-%{version}.tar.bz2
-
-BuildRequires:  autoconf >= 2.60
-BuildRequires:  automake
-BuildRequires:  libtool
+Source0:        http://xorg.freedesktop.org/releases/individual/doc/%{name}-%{version}.tar.xz
+BuildRequires:  meson
 BuildRequires:  pkg-config
 BuildRequires:  pkgconfig(xorg-macros) >= 1.8
 # This was part of the xorg-x11-util-devel package up to version 7.6
@@ -44,12 +41,11 @@ X.Org packages.
 %setup -q
 
 %build
-autoreconf -fi
-%configure
-make %{?_smp_mflags}
+%{meson}
+%{meson_build}
 
 %install
-%make_install
+%{meson_install}
 
 %files
 %defattr(-,root,root)

From 93dc5124b63e12a3527b4f3e7bb6a76cdba49081a3580d8b9c44f00f4d57ce9f Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndirsch@suse.com>
Date: Mon, 8 Apr 2024 01:46:28 +0000
Subject: [PATCH 2/2] - mark COPYING as %license in specfile

OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-sgml-doctools?expand=0&rev=11
---
 xorg-sgml-doctools.changes | 1 +
 xorg-sgml-doctools.spec    | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/xorg-sgml-doctools.changes b/xorg-sgml-doctools.changes
index 366493d..46fe4e6 100644
--- a/xorg-sgml-doctools.changes
+++ b/xorg-sgml-doctools.changes
@@ -5,6 +5,7 @@ Sun Apr  7 19:02:50 UTC 2024 - Stefan Dirsch <sndirsch@suse.com>
   * This release includes support for building with meson as well
     as autoconf.
 - switched to meson build
+- mark COPYING as %license in specfile
 
 -------------------------------------------------------------------
 Mon Apr  4 10:35:57 UTC 2022 - Stefan Dirsch <sndirsch@suse.com>
diff --git a/xorg-sgml-doctools.spec b/xorg-sgml-doctools.spec
index 5ee7734..88bf5d0 100644
--- a/xorg-sgml-doctools.spec
+++ b/xorg-sgml-doctools.spec
@@ -49,7 +49,8 @@ X.Org packages.
 
 %files
 %defattr(-,root,root)
-%doc COPYING README.md
+%doc README.md
+%license COPYING
 %{_datadir}/sgml/X11/
 %{_datadir}/pkgconfig/xorg-sgml-doctools.pc