From d62cf2f009e182cb5b24d957f67cbdbdd4ac2a498f83aa27d413bca8c086ba1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Thu, 13 Mar 2025 18:27:02 +0100 Subject: [PATCH] Sync from SUSE:SLFO:Main xorg-sgml-doctools revision dc8f17b6dbd6874899c1c56e8ea37117 --- xorg-sgml-doctools-1.12.1.tar.xz | 3 +++ xorg-sgml-doctools-1.12.tar.bz2 | 3 --- xorg-sgml-doctools.changes | 9 +++++++++ xorg-sgml-doctools.spec | 21 +++++++++------------ 4 files changed, 21 insertions(+), 15 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..46fe4e6 100644 --- a/xorg-sgml-doctools.changes +++ b/xorg-sgml-doctools.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Sun Apr 7 19:02:50 UTC 2024 - Stefan Dirsch + +- Update to version 1.12.1 + * 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 diff --git a/xorg-sgml-doctools.spec b/xorg-sgml-doctools.spec index 357e1f8..88bf5d0 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,16 +41,16 @@ X.Org packages. %setup -q %build -autoreconf -fi -%configure -make %{?_smp_mflags} +%{meson} +%{meson_build} %install -%make_install +%{meson_install} %files %defattr(-,root,root) -%doc COPYING README.md +%doc README.md +%license COPYING %{_datadir}/sgml/X11/ %{_datadir}/pkgconfig/xorg-sgml-doctools.pc