Accepting request 1038738 from home:thomas-schraitle:branches:Documentation:Tools

- Update 2.87.1
  - SBP: Add missing VERSION/VERSION.xsl
  - Add missing sbp directory in Makefile
  - Fix typo of --precision option
  - Fix #513: Correct SBP stylesheets
    - Fix broken PDF generation in `fo:block-container`
    - Add date and localized date key to FO/XHTML
    - Fix author alignment in XHTML
    - SBP(FO,XHTML): Group author elements
      - Group author, editor, and othercredit into an authorgroup
        and apply the authorgroup template (use exsl:node-set() function)
      - Make article.titlepage.recto the last template
- Spec changes
  - Remove SBP-VERSION as it is now included in the tar archive
  - Remove the patches and Makefile in 2.87.0 as it is also included now
    in the tar archive
  - Run spec-cleaner v1.2.1
  - Require libxslt-tools instead of libxslt (we need xsltproc)

OBS-URL: https://build.opensuse.org/request/show/1038738
OBS-URL: https://build.opensuse.org/package/show/Documentation:Tools/suse-xsl-stylesheets?expand=0&rev=151
This commit is contained in:
Thomas Schraitle 2022-11-28 16:16:41 +00:00 committed by Git OBS Bridge
parent 1a9c80f34e
commit 08f8a50c05
7 changed files with 71 additions and 307 deletions

View File

@ -1,40 +0,0 @@
From 04a922c7fca48684d9ce0777d468093ea1120812 Mon Sep 17 00:00:00 2001
From: Tom Schraitle <toms@suse.de>
Date: Wed, 23 Nov 2022 10:47:41 +0100
Subject: [PATCH] SBP: Include VERSION.xsl
---
sbp/fo/docbook.xsl | 3 ++-
sbp/xhtml/docbook.xsl | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/sbp/fo/docbook.xsl b/sbp/fo/docbook.xsl
index 5c49a7e..95d1f30 100644
--- a/sbp/fo/docbook.xsl
+++ b/sbp/fo/docbook.xsl
@@ -29,5 +29,6 @@
<xsl:import href="../../suse2022-ns/fo/docbook.xsl"/>
+ <xsl:include href="../VERSION.xsl"/>
<xsl:include href="article.titlepage.templates.xsl"/>
-</xsl:stylesheet>
\ No newline at end of file
+</xsl:stylesheet>
diff --git a/sbp/xhtml/docbook.xsl b/sbp/xhtml/docbook.xsl
index 7e0f82b..3babc64 100644
--- a/sbp/xhtml/docbook.xsl
+++ b/sbp/xhtml/docbook.xsl
@@ -32,6 +32,7 @@
<xsl:import href="../../suse2022-ns/xhtml/docbook.xsl"/>
+ <xsl:include href="../VERSION.xsl"/>
<xsl:include href="titlepage.templates.xsl"/>
-</xsl:stylesheet>
\ No newline at end of file
+</xsl:stylesheet>
--
2.38.0

195
Makefile
View File

@ -1,195 +0,0 @@
# Makefile for suse-xsl-stylesheets
#
# Copyright (C) 2011-2022 SUSE Linux GmbH
#
# Author:
# Frank Sundermeyer <fsundermeyer at opensuse dot org>
#
ifndef PREFIX
PREFIX := /usr/share
endif
SHELL := /bin/bash
PACKAGE := suse-xsl-stylesheets
VERSION := 2.87.0
CDIR := $(shell pwd)
SUSE_XML_PATH := $(PREFIX)/xml/suse
DB_XML_PATH := $(PREFIX)/xml/docbook
SUSE_STYLES_PATH := $(DB_XML_PATH)/stylesheet
XSL_INST_PATH := /usr/share/xml/docbook/stylesheet/
#--------------------------------------------------------------
# stylesheet directory names
DIR2005 := suse
DIR2013_DAPS := daps2013
DIR2013_OPENSUSE := opensuse2013
DIR2013_SUSE := suse2013
# SUSE2021 and beyond are only available in a namespaced version
DIR2021_SUSE := suse2021-ns
DIR2022_SUSE := suse2022-ns
DIRSBP := sbp
#--------------------------------------------------------------
# Directories and files that will be created
BUILD_DIR := $(CDIR)/build
DEV_CATALOG_DIR := $(BUILD_DIR)/catalog.d
DEV_STYLE_DIR := $(BUILD_DIR)/stylesheet
# Catalog stuff
SUSEXSL_CATALOG := catalog.d/$(PACKAGE).xml
DEV_SUSEXSL_CATALOG := $(DEV_CATALOG_DIR)/$(PACKAGE).xml
#-------
# Local Stylesheets Directories
DEV_DIR2005 := $(DEV_STYLE_DIR)/$(DIR2005)-ns
DEV_DIR2013_DAPS := $(DEV_STYLE_DIR)/$(DIR2013_DAPS)-ns
DEV_DIR2013_OPENSUSE := $(DEV_STYLE_DIR)/$(DIR2013_OPENSUSE)-ns
DEV_DIR2013_SUSE := $(DEV_STYLE_DIR)/$(DIR2013_SUSE)-ns
DEV_DIRECTORIES := $(DEV_CATALOG_DIR) \
$(DEV_DIR2005) \
$(DEV_DIR2013_DAPS) $(DEV_DIR2013_OPENSUSE) $(DEV_DIR2013_SUSE)
LOCAL_STYLEDIRS := $(DIR2005) $(DEV_DIR2005) \
$(DIR2013_DAPS) $(DEV_DIR2013_DAPS) \
$(DIR2013_OPENSUSE) $(DEV_DIR2013_OPENSUSE) \
$(DIR2013_SUSE) $(DEV_DIR2013_SUSE) \
$(DIR2021_SUSE) $(DIR2022_SUSE)
#-------------------------------------------------------
# Directories for installation
INST_STYLE_ROOT := $(DESTDIR)$(SUSE_STYLES_PATH)
STYLEDIR2005 := $(INST_STYLE_ROOT)/$(DIR2005)
STYLEDIR2005-NS := $(INST_STYLE_ROOT)/$(DIR2005)-ns
DAPSSTYLEDIR2013 := $(INST_STYLE_ROOT)/$(DIR2013_DAPS)
DAPSSTYLEDIR2013-NS := $(INST_STYLE_ROOT)/$(DIR2013_DAPS)-ns
OPENSUSESTYLEDIR2013 := $(INST_STYLE_ROOT)/$(DIR2013_OPENSUSE)
OPENSUSESTYLEDIR2013-NS := $(INST_STYLE_ROOT)/$(DIR2013_OPENSUSE)-ns
SUSESTYLEDIR2013 := $(INST_STYLE_ROOT)/$(DIR2013_SUSE)
SUSESTYLEDIR2013-NS := $(INST_STYLE_ROOT)/$(DIR2013_SUSE)-ns
SUSESTYLEDIR2021-NS := $(INST_STYLE_ROOT)/$(DIR2021_SUSE)
SUSESTYLEDIR2022-NS := $(INST_STYLE_ROOT)/$(DIR2022_SUSE)
SBPDIR := $(INST_STYLE_ROOT)/$(DIRSBP)
DOCDIR := $(DESTDIR)$(PREFIX)/doc/packages/suse-xsl-stylesheets
TTF_FONT_DIR := $(DESTDIR)$(PREFIX)/fonts/truetype
CATALOG_DIR := $(DESTDIR)/etc/xml/catalog.d
INST_STYLEDIRS := $(STYLEDIR2005) $(STYLEDIR2005-NS) \
$(DAPSSTYLEDIR2013) $(DAPSSTYLEDIR2013-NS) \
$(OPENSUSESTYLEDIR2013) $(OPENSUSESTYLEDIR2013-NS) \
$(SUSESTYLEDIR2013) $(SUSESTYLEDIR2013-NS) \
$(SUSESTYLEDIR2021-NS) $(SUSESTYLEDIR2022-NS) $(SBPDIR)
INST_DIRECTORIES := $(INST_STYLEDIRS) $(DOCDIR) \
$(TTF_FONT_DIR) $(CATALOG_DIR)
#-------------------------------------------------------
# Variables for SASS->CSS conversion and other web stuff
styles2021_sass = $(sort $(wildcard source-assets/styles2021/sass/*.sass))
styles2022_sass_main = source-assets/styles2022/sass/style.sass
styles2022_sass_custom = $(wildcard source-assets/styles2022/sass/custom/*.sass)
styles2022_sass_bulma = $(wildcard source-assets/styles2022/sass/bulma-0.9.3/bulma/sass/*/*.sass)
#############################################################
all: $(DEV_SUSEXSL_CATALOG) generate_xslns sass-css
@echo "Ready to install..."
#-----------------------------
install: | $(INST_DIRECTORIES)
install -m644 $(DEV_CATALOG_DIR)/*.xml $(CATALOG_DIR)
install -m644 COPYING* $(DOCDIR)
install -m644 fonts/*.ttf $(TTF_FONT_DIR)
tar c --mode=u+w,go+r-w,a-s -C $(DIR2005) . | (cd $(STYLEDIR2005); tar xp)
tar c --mode=u+w,go+r-w,a-s -C $(DEV_DIR2005) . | (cd $(STYLEDIR2005-NS); tar xp)
tar c --mode=u+w,go+r-w,a-s -C $(DIR2013_DAPS) . | (cd $(DAPSSTYLEDIR2013); tar xp)
tar c --mode=u+w,go+r-w,a-s -C $(DEV_DIR2013_DAPS) . | (cd $(DAPSSTYLEDIR2013-NS); tar xp)
tar c --mode=u+w,go+r-w,a-s -C $(DIR2013_OPENSUSE) . | (cd $(OPENSUSESTYLEDIR2013); tar xp)
tar c --mode=u+w,go+r-w,a-s -C $(DEV_DIR2013_OPENSUSE) . | (cd $(OPENSUSESTYLEDIR2013-NS); tar xp)
tar c --mode=u+w,go+r-w,a-s -C $(DIR2013_SUSE) . | (cd $(SUSESTYLEDIR2013); tar xp)
tar c --mode=u+w,go+r-w,a-s -C $(DEV_DIR2013_SUSE) . | (cd $(SUSESTYLEDIR2013-NS); tar xp)
tar c --mode=u+w,go+r-w,a-s -C $(DIR2021_SUSE) . | (cd $(SUSESTYLEDIR2021-NS); tar xp)
tar c --mode=u+w,go+r-w,a-s -C $(DIR2022_SUSE) . | (cd $(SUSESTYLEDIR2022-NS); tar xp)
tar c --mode=u+w,go+r-w,a-s -C $(DIRSBP) . | (cd $(SBPDIR); tar xp)
for SDIR in $(INST_STYLEDIRS); do \
sed "s/@@#version@@/$(VERSION)/" $$SDIR/VERSION.xsl > $$SDIR/VERSION.xsl.0; \
mv $$SDIR/VERSION.xsl.0 $$SDIR/VERSION.xsl; \
cp $$SDIR/VERSION.xsl $$SDIR/VERSION; \
done
#-----------------------------
.PHONY: clean
clean:
rm -rf $(BUILD_DIR)
#-----------------------------
# auto-generate the DocBook5 (xsl-ns) stylesheets
# Let's be super lazy and generate them every time make is called by
# making this target PHONY
#
.PHONY: generate_xslns
generate_xslns: | $(LOCAL_STYLEDIRS)
bin/xslns-build $(DIR2005) $(DEV_DIR2005)
bin/xslns-build $(DIR2013_DAPS) $(DEV_DIR2013_DAPS)
bin/xslns-build $(DIR2013_OPENSUSE) $(DEV_DIR2013_OPENSUSE)
bin/xslns-build $(DIR2013_SUSE) $(DEV_DIR2013_SUSE)
# Generate XML catalog file:
# * replace xml:base attribute
# * replace "build/stylesheet/" directory part
$(DEV_SUSEXSL_CATALOG): $(SUSEXSL_CATALOG) | $(DEV_CATALOG_DIR)
@echo "Creating XML catalog $@..."
@sed 's_xml:base=".."_xml:base="file://$(XSL_INST_PATH)"_g;s_"build/stylesheet/_"_g' $< > $@
# create needed directories
#
$(INST_DIRECTORIES) $(DEV_DIRECTORIES) $(BUILD_DIR):
@mkdir -p $@
#-----------------------------
# create tarball
#
# minor disadvantages of using Git here:
# * you need to commit before things are packaged (combined with a reminder,
# may actually be positive)
# * it does not work outside of a Git repo (should be inconsequential)
.PHONY: dist
dist: | $(BUILD_DIR)
@if [[ -n $$(git status -s | sed -n '/^\?\?/!p') ]]; then \
echo "There appear to be uncommitted files in this repo. Commit or stash before building a package."; \
exit 1; \
fi
git archive --format=tar.gz -o $(BUILD_DIR)/$(PACKAGE)-$(VERSION).tar.gz --prefix=$(PACKAGE)-$(VERSION)/ HEAD
@echo "Successfully created $(BUILD_DIR)/$(PACKAGE)-$(VERSION).tar.gz"
PHONY: dist-clean
dist-clean:
rm -f $(BUILD_DIR)/$(PACKAGE)-$(VERSION).tar.gz
rmdir $(BUILD_DIR) 2>/dev/null || true
PHONY: sass-css
sass-css: suse2021-ns/static/css/style.css suse2022-ns/static/css/style.css
suse2021-ns/static/css/style.css: $(styles2021_sass)
sassc $< $@
suse2022-ns/static/css/style.css: $(styles2022_sass_main) $(styles2022_sass_custom) $(styles2022_sass_bulma)
sassc $< $@
PHONY: sass-clean
sass-clean:
rm suse2021-ns/static/css/style.css
rm suse2022-ns/static/css/style.css

View File

@ -1,9 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<xsl:stylesheet version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
<xsl:param name="STYLE.NAME" select="'SUSE XSL Stylesheets'"/>
<xsl:param name="STYLE.ID" select="'sbp'"/>
<xsl:param name="STYLE.VERSION" select="'@@#version@@'"/>
</xsl:stylesheet>

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8a313f957646c137e84bf539ea5ca84b9c25bccbdbe3eb8525010a1e1efaf6b4
size 2051819

3
suse-xsl-2.87.1.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:219c5b27ecf9e7562682e50577acb481ff30c9c30fbfa676abc679305a11e9c5
size 2056565

View File

@ -1,3 +1,25 @@
-------------------------------------------------------------------
Mon Nov 28 15:31:59 UTC 2022 - Thomas Schraitle <thomas.schraitle@suse.com> - 2.87.1
- Update 2.87.1
- SBP: Add missing VERSION/VERSION.xsl
- Add missing sbp directory in Makefile
- Fix typo of --precision option
- Fix #513: Correct SBP stylesheets
- Fix broken PDF generation in `fo:block-container`
- Add date and localized date key to FO/XHTML
- Fix author alignment in XHTML
- SBP(FO,XHTML): Group author elements
- Group author, editor, and othercredit into an authorgroup
and apply the authorgroup template (use exsl:node-set() function)
- Make article.titlepage.recto the last template
- Spec changes
- Remove SBP-VERSION as it is now included in the tar archive
- Remove the patches and Makefile in 2.87.0 as it is also included now
in the tar archive
- Run spec-cleaner v1.2.1
- Require libxslt-tools instead of libxslt (we need xsltproc)
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Nov 23 11:00:00 UTC 2022 - Thomas Schraitle <thomas.schraitle@suse.com> - 2.87.0 Mon Nov 23 11:00:00 UTC 2022 - Thomas Schraitle <thomas.schraitle@suse.com> - 2.87.0

View File

@ -1,7 +1,7 @@
# #
# spec file for package suse-xsl-stylesheets # spec file for package suse-xsl-stylesheets
# #
# Copyright (c) 2022 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2022 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -12,89 +12,88 @@
# license that conforms to the Open Source Definition (Version 1.9) # license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative. # 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/
# #
Name: suse-xsl-stylesheets
Version: 2.87.0
Release: 0
%define reponame suse-xsl %define reponame suse-xsl
%define susexsl_catalog catalog-for-%{name}.xml %define susexsl_catalog catalog-for-%{name}.xml
%define db_xml_dir %{_datadir}/xml/docbook %define db_xml_dir %{_datadir}/xml/docbook
%define suse_styles_dir %{db_xml_dir}/stylesheet %define suse_styles_dir %{db_xml_dir}/stylesheet
#
Name: suse-xsl-stylesheets
Version: 2.87.1
Release: 0
Summary: SUSE-Branded Stylesheets for DocBook Summary: SUSE-Branded Stylesheets for DocBook
License: GPL-2.0 or GPL-3.0 License: GPL-2.0-only OR GPL-3.0-only
Group: Productivity/Publishing/XML Group: Productivity/Publishing/XML
Url: https://github.com/openSUSE/suse-xsl URL: https://github.com/openSUSE/suse-xsl
Source0: %{reponame}-%{version}.tar.bz2 Source0: %{reponame}-%{version}.tar.bz2
Source2: %{name}.rpmlintrc Source2: %{name}.rpmlintrc
# #
Patch0: 0001-SBP-Include-VERSION.xsl.patch
# The following files needs to be removed when we create a new release:
Source10: Makefile
Source11: SBP-VERSION
#
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
BuildRequires: docbook-xsl-stylesheets >= 1.77 BuildRequires: docbook-xsl-stylesheets >= 1.77
BuildRequires: docbook5-xsl-stylesheets >= 1.77 BuildRequires: docbook5-xsl-stylesheets >= 1.77
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: libxml2-tools
BuildRequires: libxslt
BuildRequires: make
BuildRequires: fontpackages-devel BuildRequires: fontpackages-devel
BuildRequires: libxml2-tools
BuildRequires: libxslt-tools
BuildRequires: make
BuildRequires: trang BuildRequires: trang
# DocBook schemas and stylesheets are required to be able to transform
# docbook_4/docbook_5 are required to be able to transform DocBook documents # DocBook documents.
# that use predefined DocBook entities. # DocBook4 is needed when documents use predefined DocBook entities.
Requires: docbook_4 Requires: docbook_4
Requires: docbook_5 Requires: docbook_5
Requires: docbook-xsl-stylesheets >= 1.77 Requires: docbook-xsl-stylesheets >= 1.77
Requires: docbook5-xsl-stylesheets >= 1.77 Requires: docbook5-xsl-stylesheets >= 1.77
Requires: libxslt #
Requires: libxslt-tools
Requires: sgml-skel >= 0.7 Requires: sgml-skel >= 0.7
Requires(post): sgml-skel >= 0.7 Requires(post): sgml-skel >= 0.7
Requires(postun): sgml-skel >= 0.7 Requires(postun): sgml-skel >= 0.7
#
#
# FONTS # FONTS
# For suse2022 stylesheets # "Default" fonts for suse2022 stylesheets
# "Generic" font for use in cases where we don't want one of the gnu-free-fonts
Requires: dejavu-fonts Requires: dejavu-fonts
Requires: google-opensans-fonts
Requires: google-poppins-fonts Requires: google-poppins-fonts
Requires: sil-charis-fonts Requires: sil-charis-fonts
Requires: google-opensans-fonts #
# Western fallback: currently necessary for building with XEP, it seems. # Western fallback: currently necessary for building with XEP, it seems.
Requires: ghostscript-fonts-std Requires: ghostscript-fonts-std
#
# Western fallback 2: These should make the Ghostscript fonts unnecessary. # Western fallback 2: These should make the Ghostscript fonts unnecessary.
Requires: gnu-free-fonts Requires: gnu-free-fonts
#
# Japanese (regular/bold):
Requires: google-noto-sans-jp-regular-fonts
Requires: google-noto-sans-jp-bold-fonts
# Korean (regular/bold):
Requires: google-noto-sans-kr-regular-fonts
Requires: google-noto-sans-kr-bold-fonts
# Chinese, simplified (regular/bold):
Requires: google-noto-sans-sc-regular-fonts
Requires: google-noto-sans-sc-bold-fonts
# Chinese, traditional (regular/bold):
Requires: google-noto-sans-tc-regular-fonts
Requires: google-noto-sans-tc-bold-fonts
# Arabic: # Arabic:
Requires: arabic-amiri-fonts Requires: arabic-amiri-fonts
#
# Japanese (regular/bold):
Requires: google-noto-sans-jp-bold-fonts
Requires: google-noto-sans-jp-regular-fonts
#
# Korean (regular/bold):
Requires: google-noto-sans-kr-bold-fonts
Requires: google-noto-sans-kr-regular-fonts
#
# Chinese, simplified (regular/bold):
Requires: google-noto-sans-sc-bold-fonts
Requires: google-noto-sans-sc-regular-fonts
#
# Chinese, traditional (regular/bold):
Requires: google-noto-sans-tc-bold-fonts
Requires: google-noto-sans-tc-regular-fonts
#
#
# Fonts for older stylesheets variants # Fonts for older stylesheets variants
# We use a very weak relationship as these fonts shouldn't be really # We use a very weak relationship as these fonts shouldn't be really
# used anymore (or needed, unless you need to build with older suse variants) # used anymore (or needed, unless you need to build with older suse variants)
# #
# Proprietary Western: # Proprietary Western:
Suggests: agfa-fonts Suggests: agfa-fonts
# Chinese traditional:
Suggests: arphic-uming-fonts
# Fallback for proprietary Western: # Fallback for proprietary Western:
Suggests: liberation-fonts Suggests: liberation-fonts
# Japanese: # Japanese:
@ -105,27 +104,19 @@ Suggests: ipa-pmincho-fonts
Suggests: un-fonts Suggests: un-fonts
# Chinese # Chinese
Suggests: wqy-microhei-fonts Suggests: wqy-microhei-fonts
# Chinese traditional: #
Suggests: arphic-uming-fonts BuildArch: noarch
%description %description
These are SUSE-branded XSLT 1.0 stylesheets for DocBook 4 and 5 that are be used These are SUSE-branded XSLT 1.0 stylesheets for DocBook 4 and 5 that are be used
to create the HTML, PDF, and EPUB versions of SUSE documentation. These to create the HTML, PDF, and EPUB versions of SUSE documentation. These
stylesheets are based on the original DocBook XSLT 1.0 stylesheets. stylesheets are based on the original DocBook XSLT 1.0 stylesheets.
%prep %prep
%autosetup -p1 -n %{reponame}-%{version} %autosetup -p1 -n %{reponame}-%{version}
cp %{SOURCE10} .
cp %{SOURCE11} sbp/VERSION
pushd sbp
ln -s VERSION VERSION.xsl
popd
%build %build
%__make %{?_smp_mflags} %make_build
%install %install
make install DESTDIR=%{buildroot} LIBDIR=%{_libdir} make install DESTDIR=%{buildroot} LIBDIR=%{_libdir}
@ -153,7 +144,6 @@ update-xml-catalog
%reconfigure_fonts_post %reconfigure_fonts_post
exit 0 exit 0
%postun %postun
update-xml-catalog update-xml-catalog
@ -166,13 +156,10 @@ fi
exit 0 exit 0
%posttrans %posttrans
%reconfigure_fonts_posttrans %reconfigure_fonts_posttrans
%files %files
%defattr(-,root,root)
# directories # directories
%dir %{suse_styles_dir} %dir %{suse_styles_dir}
@ -214,5 +201,4 @@ exit 0
# documentation # documentation
%doc %{_defaultdocdir}/%{name}/* %doc %{_defaultdocdir}/%{name}/*
%changelog %changelog