Accepting request 1082369 from Publishing

Correct URL (replace "%2f" -> "/"), use %{realversion} instead of %{version}

OBS-URL: https://build.opensuse.org/request/show/1082369
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/docbook-xsl?expand=0&rev=3

docbook-xsl-1.79.2-assembly-assemble.xsl.patch

@@ -0,0 +1,28 @@
+From 6127d2e45b635dd073973b5aec81acf4d8df30b3 Mon Sep 17 00:00:00 2001
+From: Tom Schraitle <tom_schr@web.de>
+Date: Wed, 19 Apr 2023 15:01:58 +0200
+Subject: [PATCH 1/1] Assembly: Copy xml:lang on <structure>
+
+This is a first patch to copy the missing xml:lang attribute to the
+result file.
+It's still not yet clear, if this will be fixed upstream and how. Other
+attributes like role, os etc. might be also affected.
+
+For details, see the docbook mailinglist:
+https://lists.oasis-open.org/archives/docbook/202304/msg00012.html
+---
+ assembly/assemble.xsl | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff -ur docbook-xsl-1.79.2.bak/assembly/assemble.xsl docbook-xsl-1.79.2/assembly/assemble.xsl
+--- docbook-xsl-1.79.2.bak/assembly/assemble.xsl	2016-12-09 23:39:10.000000000 +0100
++++ docbook-xsl-1.79.2/assembly/assemble.xsl	2023-04-19 14:54:16.562030329 +0200
+@@ -123,7 +123,7 @@
+     <xsl:attribute name="version">
+       <xsl:value-of select="$docbook.version"/>
+     </xsl:attribute>
+-    <xsl:copy-of select="@xml:id"/>
++    <xsl:copy-of select="@xml:id|@xml:lang"/>
+ 
+     <!-- use the merge element if present -->
+     <xsl:call-template name="merge.info">

docbook-xsl.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Wed Apr 19 15:29:00 UTC 2023 - Thomas Schraitle <thomas.schraitle@suse.com> - 1.79.2.1
+
+* Raise version to 1.79.2.1
+* Patch assembly/assemble.xsl
+  Copy the missing xml:lang attribute to the result file.
+  docbook-xsl-1.79.2-assembly-assemble.xsl.patch
+
+For details, see the docbook mailinglist:
+https://lists.oasis-open.org/archives/docbook/202304/msg00012.html
+
 -------------------------------------------------------------------
 Wed Mar 28 14:52:19 UTC 2018 - thomas.schraitle@suse.com
 

docbook-xsl.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package docbook-xsl
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,11 +12,11 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
-%define realversion            %{version}
+%define realversion            1.79.2
 #
 %define db4rootdir             %{_datadir}/xml/docbook/stylesheet/nwalsh
 %define db4package             docbook-xsl-stylesheets
@@ -29,14 +29,14 @@
 %define etcxmlcatalogd         %{_sysconfdir}/xml/catalog.d
 #
 Name:           docbook-xsl
-Version:        1.79.2
+Version:        1.79.2.1
 Release:        0
 Summary:        XSL Stylesheets for DocBook
-License:        MPL-1.1 AND MIT
+License:        MIT AND MPL-1.1
 Group:          Productivity/Publishing/DocBook
-Url:            https://github.com/docbook/xslt10-stylesheets
+URL:            https://github.com/docbook/xslt10-stylesheets
-Source0:        https://github.com/docbook/xslt10-stylesheets/releases/download/release%%2F%{version}/docbook-xsl-%{version}.tar.bz2
+Source0:        https://github.com/docbook/xslt10-stylesheets/releases/download/release/%{realversion}/docbook-xsl-%{realversion}.tar.bz2
-Source1:        https://github.com/docbook/xslt10-stylesheets/releases/download/release%%2F%{version}/docbook-xsl-doc-%{version}.tar.bz2
+Source1:        https://github.com/docbook/xslt10-stylesheets/releases/download/release/%{realversion}/docbook-xsl-doc-%{realversion}.tar.bz2
 Source2:        %{db4style_catalog}
 Source3:        %{db5style_catalog}
 # Build scripts
@@ -46,6 +46,8 @@ Source11:       xslnons-build
 Patch0:         %{name}-dbtoepub.patch
 ## PATCH-FIX-OPENSUSE docbook-xsl-stylesheets-non-recursive_string_subst.patch Use EXSLT replace function to avoid recursive implementation of string.subst
 Patch1:         %{name}-non-recursive_string_subst.patch
+## PATCH-FIX-OPENSUSE docbook-xsl-1.79.2-assembly-assemble.xsl.patch Copy xml:lang of to result (assemble.xsl)
+Patch2:         %{name}-%{realversion}-assembly-assemble.xsl.patch
 BuildRequires:  fdupes
 BuildRequires:  sgml-skel >= 0.7
 BuildRequires:  unzip
@@ -53,7 +55,7 @@ Requires:       docbook_4
 Requires:       sgml-skel >= 0.7
 Requires:       xmlcharent
 Requires(post): sgml-skel >= 0.7
-Requires(postun): sgml-skel >= 0.7
+Requires(postun):sgml-skel >= 0.7
 Requires(pre):  %{_bindir}/xmlcatalog
 BuildArch:      noarch
 #--------------------------------------------------------------------------
@@ -70,7 +72,7 @@ Requires:       docbook_4
 Requires:       sgml-skel >= 0.7
 Requires:       xmlcharent
 Requires(post): sgml-skel >= 0.7
-Requires(postun): sgml-skel >= 0.7
+Requires(postun):sgml-skel >= 0.7
 Suggests:       rubygem(dbtoepub)
 
 %description   -n %{db4package}
@@ -92,7 +94,7 @@ Requires:       docbook_5
 Requires:       sgml-skel >= 0.7
 Requires:       xmlcharent
 Requires(post): sgml-skel >= 0.7
-Requires(postun): sgml-skel >= 0.7
+Requires(postun):sgml-skel >= 0.7
 Suggests:       rubygem(dbtoepub)
 
 %description   -n docbook5-xsl-stylesheets
@@ -143,6 +145,7 @@ tar xf %{SOURCE1} -C docbook-xsl-%{realversion}-ns --strip-components 1
 (cd docbook-xsl-%{realversion}-ns
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 # Remove some Python and Java extensions
 # Remove dbtoepub Ruby script. This has been moved to devel:languages:ruby:extensions