Accepting request 1034839 from Documentation:Tools
Automatic submission by obs-autosubmit OBS-URL: https://build.opensuse.org/request/show/1034839 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/daps?expand=0&rev=50
This commit is contained in:
commit
b1a1997017
4
_service
4
_service
@ -1,10 +1,10 @@
|
||||
<services>
|
||||
<service name="tar_scm" mode="disabled">
|
||||
<param name="versionformat">3.3.1</param>
|
||||
<param name="versionformat">3.3.2</param>
|
||||
<param name="versionprefix"></param>
|
||||
<param name="url">https://github.com/openSUSE/daps.git</param>
|
||||
<param name="scm">git</param>
|
||||
<param name="revision">3.3.1</param>
|
||||
<param name="revision">3.3.2</param>
|
||||
</service>
|
||||
<service name="recompress" mode="disabled">
|
||||
<param name="file">*.tar</param>
|
||||
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:394c3f0417accca5e2119335a39bc1b7ac0964d7fe0e2ed5e349ba6eead880e3
|
||||
size 4393335
|
BIN
daps-3.3.2.tar.bz2
(Stored with Git LFS)
Normal file
BIN
daps-3.3.2.tar.bz2
(Stored with Git LFS)
Normal file
Binary file not shown.
@ -1,35 +0,0 @@
|
||||
From a58f0f58a318f795bdfe763ea8fc5a5d69ec1cfd Mon Sep 17 00:00:00 2001
|
||||
From: Tom Schraitle <toms@suse.de>
|
||||
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 @@
|
||||
</xsl:attribute>
|
||||
</xsl:template>
|
||||
|
||||
-<!-- Remove any non-XInclude attributes -->
|
||||
-<xsl:template match="xi:include/@*" mode="profile" />
|
||||
+<!-- Remove any non-XInclude attributes
|
||||
+
|
||||
+ Issue #676: add priority="0" to overwrite default priority of 0.5 -> 0
|
||||
+ The recovery strategy has changed in libxslt >=1.1.35
|
||||
+ See https://www.w3.org/TR/1999/REC-xslt-19991116#conflict
|
||||
+-->
|
||||
+<xsl:template match="xi:include/@*" mode="profile" priority="0" />
|
||||
|
||||
</xsl:stylesheet>
|
34
daps.changes
34
daps.changes
@ -1,3 +1,37 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Oct 25 15:09:13 UTC 2022 - Frank Sundermeyer <fsundermeyer@opensuse.org>
|
||||
|
||||
Stable release DAPS 3.3.2:
|
||||
|
||||
* Bug fixes:
|
||||
- Make DAPS work with libslt > 1.1.34
|
||||
(https://github.com/openSUSE/daps/issues/679)
|
||||
- Profiling no longer requires processing instruction
|
||||
- if DC-file/command line contains profile settings the
|
||||
profiling stylesheets will autoimatically be applied
|
||||
(https://github.com/openSUSE/daps/issues/529)
|
||||
- FOP support for google noto-sans fonts (for Japanese, Korean,
|
||||
traditional & simplified Chinese)
|
||||
(https://github.com/openSUSE/daps/issues/684)
|
||||
- Fix validation error where errors were ignored or failed with a
|
||||
bash error
|
||||
(https://github.com/openSUSE/daps/issues/679)
|
||||
- unpacking locdrops automatically removes dm:editurl from
|
||||
docmanager XML header (if present)
|
||||
- Building parts of a document (with --rootid) is no longer
|
||||
supported when rootid points to a section or sect1 (because
|
||||
depending on HTML chunkling, this may result in an empty
|
||||
document)
|
||||
(https://github.com/openSUSE/daps/issues/686)
|
||||
|
||||
* Helper scripts:
|
||||
- Added a few scripts for handling SUSE localization branches,
|
||||
improving SEO and migrating frm DocBook4 to DocBook5
|
||||
- can be found in the sources under contrib/ (not included in
|
||||
SUSE packages)
|
||||
|
||||
* Obsoletes patch daps-fix-build-against-libxslt-1.1.36+.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Oct 17 10:57:24 UTC 2022 - David Anes <david.anes@suse.com>
|
||||
|
||||
|
@ -1,11 +1,11 @@
|
||||
addFilter("explicit-lib-dependency libxml2")
|
||||
addFilter("explicit-lib-dependency libxslt")
|
||||
addFilter("explicit-lib-dependency liberation-fonts")
|
||||
#addFilter("explicit-lib-dependency liberation-fonts")
|
||||
#addFilter("non-executable-script .*/daps/lib/daps_functions")
|
||||
addFilter("non-executable-script .*/daps/lib/*")
|
||||
#addFilter("non-executable-script .*/daps/lib/*")
|
||||
# false positive
|
||||
addFilter("no-manual-page-for-binary daps-init")
|
||||
#addFilter("no-manual-page-for-binary daps-init")
|
||||
# internally used only, no man page needed
|
||||
addFilter("no-manual-page-for-binary daps-auto.pl")
|
||||
addFilter("no-manual-page-for-binary daps-xmlformat")
|
||||
addFilter("no-manual-page-for-binary daps-check-deps")
|
||||
#addFilter("no-manual-page-for-binary daps-auto.pl")
|
||||
#addFilter("no-manual-page-for-binary daps-xmlformat")
|
||||
#addFilter("no-manual-page-for-binary daps-check-deps")
|
||||
|
11
daps.spec
11
daps.spec
@ -17,7 +17,7 @@
|
||||
|
||||
|
||||
Name: daps
|
||||
Version: 3.3.1
|
||||
Version: 3.3.2
|
||||
Release: 0
|
||||
|
||||
%define docbuilddir %{_datadir}/daps
|
||||
@ -29,8 +29,6 @@ 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
|
||||
@ -123,11 +121,16 @@ 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
|
||||
|
Loading…
Reference in New Issue
Block a user