diff --git a/assemble.xsl b/assemble.xsl
new file mode 100644
index 0000000..376c2ca
--- /dev/null
+++ b/assemble.xsl
@@ -0,0 +1,753 @@
+
+
+
+
+
+
+
+
+
+
+
+5.0
+book
+section
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ERROR: structure.id param set to '
+
+ ' but no element with that xml:id exists in assembly.
+
+
+
+
+ ERROR: structure.id param set to '
+
+ ' but no structure with that xml:id exists in assembly.
+
+
+
+
+
+
+
+
+
+ ERROR: output.type param set to '
+
+ but no structure element has that type attribute. Exiting.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ renderas
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ERROR: cannot determine output element name for
+ module with no @resourceref and no @renderas. Exiting.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ERROR: cannot determine output element name for
+ @resourceref="
+
+ ". Exiting.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ERROR: cannot determine output element name for
+ structure with no @renderas and no $root.default.renderas.
+ Exiting.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ERROR: no xml:id matches @resourceref = '
+
+ '.
+
+
+
+
+ ERROR: xml:id matching @resourceref = '
+
+ is not a resource element'.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ERROR: resource with @xml:id='
+
+ ' does not resolve to a filename.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ERROR: @href = '
+
+ ' has no content or is unresolved.
+
+
+
+
+
+
+
+
+
+
+
+
+
+ omittitles
+
+
+
+
+
+ contentonly
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ERROR: no xml:id matches @resourceref = '
+
+ '.
+
+
+
+
+ ERROR: xml:id matching @resourceref = '
+
+ is not a resource element'.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ WARNING: the <relationships> element is not currently
+ supported by this stylesheet.
+
+
+
+
+
+ WARNING: the <transforms> element is not currently
+ supported by this stylesheet.
+
+
+
+
diff --git a/docbook-xsl-1.79.2-assembly-assemble.xsl.patch b/docbook-xsl-1.79.2-assembly-assemble.xsl.patch
deleted file mode 100644
index dfc3e7f..0000000
--- a/docbook-xsl-1.79.2-assembly-assemble.xsl.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 6127d2e45b635dd073973b5aec81acf4d8df30b3 Mon Sep 17 00:00:00 2001
-From: Tom Schraitle
-Date: Wed, 19 Apr 2023 15:01:58 +0200
-Subject: [PATCH 1/1] Assembly: Copy xml:lang on
-
-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 @@
-
-
-
--
-+
-
-
-
diff --git a/docbook-xsl.changes b/docbook-xsl.changes
index a6ecdc0..578b02e 100644
--- a/docbook-xsl.changes
+++ b/docbook-xsl.changes
@@ -1,3 +1,33 @@
+-------------------------------------------------------------------
+Mon Feb 26 08:05:33 UTC 2024 - Dominique Leuenberger
+
+- Use %patch -P N instead of deprecated %patchN.
+
+-------------------------------------------------------------------
+Thu Nov 9 09:27:14 UTC 2023 - Thomas Schraitle 1.79.2.2
+
+- Raise version to 1.79.2.2
+ Integrate latest changes from assembly/assemble.xsl and
+ assembly/effectivity.xsl
+- Remove docbook-xsl-1.79.2-assembly-assemble.xsl.patch
+ We copy the two files directly.
+
+These two files contains the following overall changes:
+
+- Fix #254: Pass structure/@xml:lang to result doc
+- Support filterin/filterout elements
+- Fix problem with resourceref to another structure in assemblies
+- fix #28 assemble.xsl: imagedata filerefs in assembled output
+ document may be incorrect
+- Fix #27 to allow merge from resource of titles not inside info
+ because they are equivalent to titles inside info. Also fixe
+ a couple of other problems noticed during testing.
+
+For details, see the upstream Git repo and run:
+
+ $ git diff release/1.79.2..master -- \
+ xsl/assembly/assemble.xsl xsl/assembly/effectivity.xsl
+
-------------------------------------------------------------------
Wed Apr 19 15:29:00 UTC 2023 - Thomas Schraitle - 1.79.2.1
diff --git a/docbook-xsl.spec b/docbook-xsl.spec
index 4bd25a6..21c54f3 100644
--- a/docbook-xsl.spec
+++ b/docbook-xsl.spec
@@ -29,7 +29,7 @@
%define etcxmlcatalogd %{_sysconfdir}/xml/catalog.d
#
Name: docbook-xsl
-Version: 1.79.2.1
+Version: 1.79.2.2
Release: 0
Summary: XSL Stylesheets for DocBook
License: MIT AND MPL-1.1
@@ -42,12 +42,14 @@ Source3: %{db5style_catalog}
# Build scripts
Source10: dbxslt-install.sh
Source11: xslnons-build
+#
+Source20: assemble.xsl
+Source21: effectivity.xsl
## PATCH-FIX-OPENSUSE docbook-xsl-stylesheets-dbtoepub.patch Fixed dirname
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
@@ -143,9 +145,9 @@ tar xf %{SOURCE1} -C docbook-xsl-%{realversion}-ns --strip-components 1
# Patch the orginal source and remove unnecessary files:
(cd docbook-xsl-%{realversion}-ns
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
+%patch -P 0 -p1
+%patch -P 1 -p1
+# %%patch -P 2 -p1
# Remove some Python and Java extensions
# Remove dbtoepub Ruby script. This has been moved to devel:languages:ruby:extensions
@@ -192,6 +194,9 @@ mkdir -p %{buildroot}%{_sysconfdir}/xml/catalog.d \
# The directory is already available at this point:
install -m644 %{db4style_catalog} %{db5style_catalog} %{buildroot}%{etcxmlcatalogd}
+# Overwrite our files from assembly directory
+cp %{SOURCE20} %{SOURCE21} %{buildroot}%{db5rootdir}/%{realversion}/assembly/
+
%fdupes -s %{buildroot}
%post -n %{db4package}
diff --git a/effectivity.xsl b/effectivity.xsl
new file mode 100644
index 0000000..5e457fa
--- /dev/null
+++ b/effectivity.xsl
@@ -0,0 +1,386 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ exclude
+ INFO: filtering out a module or structure because the arch attribute value is set to .
+
+
+
+ exclude
+ INFO: filtering out a module or structure because the audience attribute value is set to .
+
+
+
+ exclude
+ INFO: filtering out a module or structure because the condition attribute value is set to .
+
+
+
+ exclude
+ INFO: filtering out a module or structure because the conformance attribute value is set to .
+
+
+
+ exclude
+ INFO: filtering out a module or structure because the os attribute value is set to .
+
+
+
+ exclude
+ INFO: filtering out a module or structure because the outputformat attribute value is set to .
+
+
+
+ exclude
+ INFO: filtering out a module or structure because the revision attribute value is set to .
+
+
+
+ exclude
+ INFO: filtering out a module or structure because the security attribute value is set to .
+
+
+
+ exclude
+ INFO: filtering out a module or structure because the userlevel attribute value is set to .
+
+
+
+ exclude
+ INFO: filtering out a module or structure because the vendor attribute value is set to .
+
+
+
+ exclude
+ INFO: filtering out a module or structure because the wordsize attribute value is set to .
+
+
+
+ INFO: no filterout attributes matched.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ include
+ INFO (filterin): including a module or structure because the arch attribute value is set to .
+
+
+
+ include
+ INFO: including a module or structure because the audience attribute value is set to .
+
+
+
+ include
+ INFO: including a module or structure because the condition attribute value is set to .
+
+
+
+ include
+ INFO: including a module or structure because the conformance attribute value is set to .
+
+
+
+ include
+ INFO: including a module or structure because the os attribute value is set to .
+
+
+
+ include
+ INFO: including a module or structure because the outputformat attribute value is set to .
+
+
+
+ include
+ INFO: including a module or structure because the revision attribute value is set to .
+
+
+
+ include
+ INFO: including a module or structure because the security attribute value is set to .
+
+
+
+ include
+ INFO: including a module or structure because the userlevel attribute value is set to .
+
+
+
+ include
+ INFO: including a module or structure because the vendor attribute value is set to .
+
+
+
+ include
+ INFO: including a module or structure because the wordsize attribute value is set to .
+
+
+
+ exclude
+ INFO: No modules or structures matched attributes for inclusion.
+
+
+
+
+
+
+