From 5fbc0d6af37228ff09e68acb80ce74382d8f808e805fb65e699f974c7490aa93 Mon Sep 17 00:00:00 2001 From: Thomas Schraitle Date: Wed, 23 Mar 2022 07:40:08 +0000 Subject: [PATCH 1/3] Disable project.diff OBS-URL: https://build.opensuse.org/package/show/Documentation:Tools/daps?expand=0&rev=228 --- project.diff | 104 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 104 insertions(+) create mode 100644 project.diff diff --git a/project.diff b/project.diff new file mode 100644 index 0000000..75b878d --- /dev/null +++ b/project.diff @@ -0,0 +1,104 @@ +--- _service.orig ++++ _service +@@ -1,10 +1,10 @@ + + +- 3.2.0 ++ 3.3.1 + + https://github.com/openSUSE/daps.git + git +- 3.2.0 ++ 3.3.1 + + + *.tar +--- daps.changes.orig ++++ daps.changes +@@ -1,4 +1,48 @@ + ------------------------------------------------------------------- ++Mon Feb 14 08:00:00 UTC 2022 - Stefan Knorr ++ ++- Stable release DAPS 3.3.1: ++ ++* Bug fixes: ++ - Added `--not-validate-tables` parameter that disables extended ++ table validation to additional targets ++ ++------------------------------------------------------------------- ++Mon Feb 7 17:49:54 UTC 2022 - Stefan Knorr ++ ++- Stable release DAPS 3.3.0: ++ ++* New features: ++ - DocBook table validation is now enabled by default as part of ++ validation and building (#532) ++ - Improved validation to always check XML validity, tables, ++ images, and IDs, rather than stopping after the first issue ++ occurs ++ - Set up Poppins font in FOP config delivered with DAPS ++ ++* Bug fixes: ++ - Fixed validation failures occurring because `--verbose` was set ++ - Fixed xml-wellformedness check to use a non-zero exit code ++ when entity definitions are missing (#539) ++ - Improved image check during validation to check within context ++ of entire set, not just current root ID (#627) ++ - Fixed output of missing/duplicated image list displayed during ++ build (#634) ++ - Fixed paths to entity files in `unpack-locdrop` ++ - Fixed output of `daps -v` when there is no XSL-FO formatter ++ installed (#622) ++ - Fixed `daps spellcheck --help` output ++ - Improved messages for `unpack-locdrop` and other subcommands ++ ++* Removed features: ++ - Removed unused `process-xrefs` and `checkconformance` ++ stylesheets (#612) ++ ++* Repository changes: ++ - Integrated Python tooling and tests for `xml-wellformed` and ++ `getentityname` ++ ++------------------------------------------------------------------- + Thu Jun 10 10:43:46 UTC 2021 - Stefan Knorr + + - Stable release DAPS 3.2.0: +--- daps.spec.orig ++++ daps.spec +@@ -1,7 +1,7 @@ + # + # spec file for package daps + # +-# Copyright (c) 2021 SUSE LLC ++# Copyright (c) 2022 SUSE LLC + # + # All modifications and additions to the file contributed by third parties + # remain the property of their copyright owners, unless otherwise agreed +@@ -17,7 +17,7 @@ + + + Name: daps +-Version: 3.2.0 ++Version: 3.3.1 + Release: 0 + + %define docbuilddir %{_datadir}/daps +@@ -118,7 +118,9 @@ validator, link checker, spellchecker, e + converting DocBook XML. + + ++ + #-------------------------------------------------------------------------- ++ + %prep + %setup -q -n %{name}-%{version} + +@@ -178,7 +180,6 @@ exit 0 + %doc %{_defaultdocdir}/%{name}/* + + %{_bindir}/* +-%attr(644, root, root) %{_datadir}/%{name}/libexec/*.xsl + %{_datadir}/bash-completion/completions/%{name} + %{_datadir}/emacs/site-lisp/docbook_macros.el + %{_datadir}/xml/daps/schema/* From cf0eeaa23e2e01c707a5832cb64a251bba7db8d9a9a85a5130f93ac10e65507b Mon Sep 17 00:00:00 2001 From: Thomas Schraitle Date: Wed, 23 Mar 2022 07:41:21 +0000 Subject: [PATCH 2/3] OBS-URL: https://build.opensuse.org/package/show/Documentation:Tools/daps?expand=0&rev=229 --- project.diff | 104 --------------------------------------------------- 1 file changed, 104 deletions(-) delete mode 100644 project.diff diff --git a/project.diff b/project.diff deleted file mode 100644 index 75b878d..0000000 --- a/project.diff +++ /dev/null @@ -1,104 +0,0 @@ ---- _service.orig -+++ _service -@@ -1,10 +1,10 @@ - - -- 3.2.0 -+ 3.3.1 - - https://github.com/openSUSE/daps.git - git -- 3.2.0 -+ 3.3.1 - - - *.tar ---- daps.changes.orig -+++ daps.changes -@@ -1,4 +1,48 @@ - ------------------------------------------------------------------- -+Mon Feb 14 08:00:00 UTC 2022 - Stefan Knorr -+ -+- Stable release DAPS 3.3.1: -+ -+* Bug fixes: -+ - Added `--not-validate-tables` parameter that disables extended -+ table validation to additional targets -+ -+------------------------------------------------------------------- -+Mon Feb 7 17:49:54 UTC 2022 - Stefan Knorr -+ -+- Stable release DAPS 3.3.0: -+ -+* New features: -+ - DocBook table validation is now enabled by default as part of -+ validation and building (#532) -+ - Improved validation to always check XML validity, tables, -+ images, and IDs, rather than stopping after the first issue -+ occurs -+ - Set up Poppins font in FOP config delivered with DAPS -+ -+* Bug fixes: -+ - Fixed validation failures occurring because `--verbose` was set -+ - Fixed xml-wellformedness check to use a non-zero exit code -+ when entity definitions are missing (#539) -+ - Improved image check during validation to check within context -+ of entire set, not just current root ID (#627) -+ - Fixed output of missing/duplicated image list displayed during -+ build (#634) -+ - Fixed paths to entity files in `unpack-locdrop` -+ - Fixed output of `daps -v` when there is no XSL-FO formatter -+ installed (#622) -+ - Fixed `daps spellcheck --help` output -+ - Improved messages for `unpack-locdrop` and other subcommands -+ -+* Removed features: -+ - Removed unused `process-xrefs` and `checkconformance` -+ stylesheets (#612) -+ -+* Repository changes: -+ - Integrated Python tooling and tests for `xml-wellformed` and -+ `getentityname` -+ -+------------------------------------------------------------------- - Thu Jun 10 10:43:46 UTC 2021 - Stefan Knorr - - - Stable release DAPS 3.2.0: ---- daps.spec.orig -+++ daps.spec -@@ -1,7 +1,7 @@ - # - # spec file for package daps - # --# Copyright (c) 2021 SUSE LLC -+# Copyright (c) 2022 SUSE LLC - # - # All modifications and additions to the file contributed by third parties - # remain the property of their copyright owners, unless otherwise agreed -@@ -17,7 +17,7 @@ - - - Name: daps --Version: 3.2.0 -+Version: 3.3.1 - Release: 0 - - %define docbuilddir %{_datadir}/daps -@@ -118,7 +118,9 @@ validator, link checker, spellchecker, e - converting DocBook XML. - - -+ - #-------------------------------------------------------------------------- -+ - %prep - %setup -q -n %{name}-%{version} - -@@ -178,7 +180,6 @@ exit 0 - %doc %{_defaultdocdir}/%{name}/* - - %{_bindir}/* --%attr(644, root, root) %{_datadir}/%{name}/libexec/*.xsl - %{_datadir}/bash-completion/completions/%{name} - %{_datadir}/emacs/site-lisp/docbook_macros.el - %{_datadir}/xml/daps/schema/* From 62b1a3d0ac7584f0b53e0e746d63e02b6aca117c49e163376bcec02c76b005e5 Mon Sep 17 00:00:00 2001 From: Frank Sundermeyer Date: Tue, 18 Oct 2022 15:09:22 +0000 Subject: [PATCH 3/3] Accepting request 1012064 from home:david.anes:daps_test * Add patch to build against libxslt 1.1.36+: - In libxslt >=1.1.35, the XSLT processor changed the resolution strategy. It gets two template rules (xi:include/@href and xi:include/@*) with the same priority (0.5). That's why we need to lower the priority to zero for xi:include/@* - Added patch "daps-fix-build-against-libxslt-1.1.36+.patch" OBS-URL: https://build.opensuse.org/request/show/1012064 OBS-URL: https://build.opensuse.org/package/show/Documentation:Tools/daps?expand=0&rev=230 --- daps-fix-build-against-libxslt-1.1.36+.patch | 35 ++++++++++++++++++++ daps.changes | 10 ++++++ daps.spec | 5 +++ 3 files changed, 50 insertions(+) create mode 100644 daps-fix-build-against-libxslt-1.1.36+.patch diff --git a/daps-fix-build-against-libxslt-1.1.36+.patch b/daps-fix-build-against-libxslt-1.1.36+.patch new file mode 100644 index 0000000..a3dd05c --- /dev/null +++ b/daps-fix-build-against-libxslt-1.1.36+.patch @@ -0,0 +1,35 @@ +From a58f0f58a318f795bdfe763ea8fc5a5d69ec1cfd Mon Sep 17 00:00:00 2001 +From: Tom Schraitle +Date: Tue, 11 Oct 2022 08:30:47 +0200 +Subject: [PATCH] Fix #676: Add priority=0 in xi:include/@* + +For libxslt >=1.1.35, the default selection strategy has been changed +(see GNOME/libxslt@b0074ee). + +In libxslt >=1.1.35, the XSLT processor changed the resolution strategy. +It gets two template rules (xi:include/@href and xi:include/@*) with the +same priority (0.5). That's why we need to lower the priority to zero +for xi:include/@* +--- + daps-xslt/profiling/base-profile.xsl | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git a/daps-xslt/profiling/base-profile.xsl b/daps-xslt/profiling/base-profile.xsl +index 819224e5f..474489662 100644 +--- a/daps-xslt/profiling/base-profile.xsl ++++ b/daps-xslt/profiling/base-profile.xsl +@@ -218,7 +218,12 @@ + + + +- +- ++ ++ + + diff --git a/daps.changes b/daps.changes index 6e3c40a..75763f5 100644 --- a/daps.changes +++ b/daps.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Mon Oct 17 10:57:24 UTC 2022 - David Anes + +* Add patch to build against libxslt 1.1.36+: + - In libxslt >=1.1.35, the XSLT processor changed the resolution + strategy. It gets two template rules (xi:include/@href and + xi:include/@*) with the same priority (0.5). That's why we need + to lower the priority to zero for xi:include/@* + - Added patch "daps-fix-build-against-libxslt-1.1.36+.patch" + ------------------------------------------------------------------- Mon Feb 14 08:00:00 UTC 2022 - Stefan Knorr diff --git a/daps.spec b/daps.spec index 5c6e32e..208933d 100644 --- a/daps.spec +++ b/daps.spec @@ -28,6 +28,9 @@ Group: Productivity/Publishing/XML URL: https://github.com/openSUSE/daps Source0: %{name}-%{version}.tar.bz2 Source1: %{name}.rpmlintrc + +Patch0: daps-fix-build-against-libxslt-1.1.36+.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -119,10 +122,12 @@ converting DocBook XML. + #-------------------------------------------------------------------------- %prep %setup -q -n %{name}-%{version} +%autopatch -p1 # Correct shebang line as suggested in # https://lists.opensuse.org/opensuse-packaging/2018-03/msg00017.html