From b9a765b93ae42527e360aa53848e408f7b55c0e33568841dd85510754ba22dc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Mon, 15 Apr 2019 09:14:32 +0000 Subject: [PATCH] Accepting request 694177 from home:keichwa:branches:Publishing - Enable 4.5 SGML and XML DTD for processing with SGML tools; bsc#1072957. - Do not install catalogs in /var/lib/sgml; bsc#1093345. OBS-URL: https://build.opensuse.org/request/show/694177 OBS-URL: https://build.opensuse.org/package/show/Publishing/docbook_4?expand=0&rev=26 --- CATALOG.docbook_4 | 6 ++++++ Makefile | 5 +++-- docbook_4.changes | 7 +++++++ docbook_4.spec | 4 ++-- 4 files changed, 18 insertions(+), 4 deletions(-) diff --git a/CATALOG.docbook_4 b/CATALOG.docbook_4 index 28d521b..10289f7 100644 --- a/CATALOG.docbook_4 +++ b/CATALOG.docbook_4 @@ -2,6 +2,10 @@ OVERRIDE YES -- Load iso_ent early to prevent docbook.cat from biting -- CATALOG "/var/lib/sgml/CATALOG.iso_ent" +DTDDECL "-//OASIS//DTD DocBook CALS Table Model V4.5//EN" /usr/share/sgml/docbook/dtd/4.5/docbook.dcl +DTDDECL "-//OASIS//DTD DocBook V4.5//EN" "/usr/share/sgml/docbook/dtd/4.5/docbook.dcl" +CATALOG "/usr/share/sgml/docbook/dtd/4.5/docbook.cat" + DTDDECL "-//OASIS//DTD DocBook CALS Table Model V4.4//EN" /usr/share/sgml/docbook/dtd/4.4/docbook.dcl DTDDECL "-//OASIS//DTD DocBook V4.4//EN" "/usr/share/sgml/docbook/dtd/4.4/docbook.dcl" CATALOG "/usr/share/sgml/docbook/dtd/4.4/docbook.cat" @@ -37,12 +41,14 @@ PUBLIC "-//OASIS//ELEMENTS DocBook Document Hierarchy V4.1//EN" "/usr/share/sgml PUBLIC "-//OASIS//ELEMENTS DocBook Document Hierarchy V4.1.2//EN" "/usr/share/sgml/docbook/dtd/4.1/dbhier.mod" PUBLIC "-//OASIS//ELEMENTS DocBook Document Hierarchy V4.0//EN" "/usr/share/sgml/docbook/dtd/4.1/dbhier.mod" PUBLIC "-//OASIS//DTD XML Exchange Table Model 19990315//EN" "/usr/share/sgml/docbook/dtd/4.2/soextblx.dtd" +PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "/usr/share/sgml/docbook/dtd/4.5/docbookx.dtd" PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "/usr/share/sgml/docbook/dtd/4.4/docbookx.dtd" PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "/usr/share/sgml/docbook/dtd/4.2/docbookx.dtd" PUBLIC "-//OASIS//DTD DocBook V4.2//EN" "/usr/share/sgml/docbook/dtd/4.2/docbook.dtd" PUBLIC "-//OASIS//DTD DocBook V4.1//EN" "/usr/share/sgml/docbook/dtd/4.1/docbook.dtd" PUBLIC "-//OASIS//DTD DocBook V4.1.2//EN" "/usr/share/sgml/docbook/dtd/4.1/docbook.dtd" PUBLIC "-//OASIS//DTD DocBook V4.0//EN" "/usr/share/sgml/docbook/dtd/4.1/docbook.dtd" +PUBLIC "-//OASIS//ELEMENTS DocBook XML HTML Tables V4.5//EN" "/usr/share/sgml/docbook/dtd/4.5/htmltblx.mod" PUBLIC "-//OASIS//ELEMENTS DocBook XML HTML Tables V4.4//EN" "/usr/share/sgml/docbook/dtd/4.4/htmltblx.mod" PUBLIC "-//OASIS//ELEMENTS DocBook XML HTML Tables V4.3//EN" "/usr/share/sgml/docbook/dtd/4.3/htmltblx.mod" -- PUBLIC "-//OASIS//DTD DocBook CALS Table Model V4.4//EN" "/usr/share/sgml/docbook/dtd/4.4/calstblx.dtd" -- diff --git a/Makefile b/Makefile index 9f24a60..ee546a0 100644 --- a/Makefile +++ b/Makefile @@ -94,7 +94,8 @@ install: | $(XML_IN_SGML_DIRS) $(SGML_CONFIG_DIR)/CATALOG.%: CATALOG.% | $(SGML_CONFIG_DIR) $(SGML_CATALOG_DIR) @echo "# Installing SGML catalog $<..." - cp $< $(dir $@) +# No longer wanted in /var hierarchy; see bsc#1093345 +# cp $< $(dir $@) cp $< $(SGML_CATALOG_DIR) $(XML_IN_SGML_DIRS): | $(INST_DIRECTORIES) @@ -116,7 +117,7 @@ $(XML_SCHEMA_DIR)/rng/%/docbook.rng: docbook-rng-% $(XML_SCHEMA_DIR)/xsd/%/docbook.xsd: docbook-xsd-% @echo "# Copying $<" @cp -a $ + +- Enable 4.5 SGML and XML DTD for processing with SGML tools; + bsc#1072957. +- Do not install catalogs in /var/lib/sgml; bsc#1093345. + ------------------------------------------------------------------- Mon Nov 13 15:56:39 UTC 2017 - thomas.schraitle@suse.com diff --git a/docbook_4.spec b/docbook_4.spec index 3993e4d..55e7328 100644 --- a/docbook_4.spec +++ b/docbook_4.spec @@ -1,7 +1,7 @@ # # spec file for package docbook_4 # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -197,7 +197,7 @@ fi exit 0 %files -%config %{sgml_config_dir}/CATALOG.* +# %%config %%{sgml_config_dir}/CATALOG.* %config %{_sysconfdir}/xml/catalog.d/%{name}.xml %doc README.SUSE