SHA256
1
0
forked from pool/docbook_4

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
This commit is contained in:
Tomáš Chvátal 2019-04-15 09:14:32 +00:00 committed by Git OBS Bridge
parent db5fb755d3
commit b9a765b93a
4 changed files with 18 additions and 4 deletions

View File

@ -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" --

View File

@ -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 $</* $(dir $@)
$(XML_CATALOG): $(DB_CATALOG_SRC) | $(XML_CATALOG_DIR)
@echo "# Installing XML Catalog..."
install -m644 $< $@

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon Apr 15 08:12:37 UTC 2019 - Karl Eichwalder <ke@suse.de>
- 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

View File

@ -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