From 5a68b935289bdd23410e0b5e0d02a2e4e0d9154c07fe386f92077966e4deed17 Mon Sep 17 00:00:00 2001 From: Thomas Schraitle Date: Mon, 15 Jul 2013 06:15:23 +0000 Subject: [PATCH] - Fixed bnc#828872 Missing system identifier http://www.docbook.org/xml/$VER/ added - Spec file: Removed docbook-4-3-cat.diff patch as it is obsolete now Removed obsoletes and provides of docbk_4; don't use it anymore! Removed libxml2 dependency; this is already covered with xml-catalog OBS-URL: https://build.opensuse.org/package/show/Publishing/docbook_4?expand=0&rev=15 --- docbook-4-3-cat.diff | 123 ------------------------------------------- docbook_4.changes | 11 ++++ docbook_4.spec | 16 +++--- 3 files changed, 21 insertions(+), 129 deletions(-) delete mode 100644 docbook-4-3-cat.diff diff --git a/docbook-4-3-cat.diff b/docbook-4-3-cat.diff deleted file mode 100644 index 528b012..0000000 --- a/docbook-4-3-cat.diff +++ /dev/null @@ -1,123 +0,0 @@ ---- docbook_4/dtd/4.3/docbook.cat.~1~ 2004-03-31 13:44:16.000000000 +0200 -+++ docbook_4/dtd/4.3/docbook.cat 2004-06-04 15:43:29.239811600 +0200 -@@ -52,62 +52,62 @@ - -- ...................................................................... -- - -- ISO entity sets ...................................................... -- - --PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN" -- "iso-dia.gml" -- --PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" -- "iso-num.gml" -- --PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN" -- "iso-pub.gml" -- --PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN" -- "iso-tech.gml" -- --PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN" -- "iso-lat1.gml" -- --PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN" -- "iso-lat2.gml" -- --PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN" -- "iso-grk1.gml" -- --PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" -- "iso-grk2.gml" -- --PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN" -- "iso-grk3.gml" -- --PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" -- "iso-grk4.gml" -- --PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" -- "iso-amsa.gml" -- --PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" -- "iso-amsb.gml" -- --PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" -- "iso-amsc.gml" -- --PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" -- "iso-amsn.gml" -- --PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" -- "iso-amso.gml" -- --PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" -- "iso-amsr.gml" -- --PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" -- "iso-box.gml" -- --PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" -- "iso-cyr1.gml" -- --PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" -- "iso-cyr2.gml" -+-- PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN" -- -+-- "iso-dia.gml" -- -+-- -- -+-- PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" -- -+-- "iso-num.gml" -- -+-- -- -+-- PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN" -- -+-- "iso-pub.gml" -- -+-- -- -+-- PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN" -- -+-- "iso-tech.gml" -- -+-- -- -+-- PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN" -- -+-- "iso-lat1.gml" -- -+-- -- -+-- PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN" -- -+-- "iso-lat2.gml" -- -+-- -- -+-- PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN" -- -+-- "iso-grk1.gml" -- -+-- -- -+-- PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" -- -+-- "iso-grk2.gml" -- -+-- -- -+-- PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN" -- -+-- "iso-grk3.gml" -- -+-- -- -+-- PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" -- -+-- "iso-grk4.gml" -- -+-- -- -+-- PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN"-- -+-- "iso-amsa.gml" -- -+-- -- -+-- PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN"-- -+-- "iso-amsb.gml" -- -+-- -- -+-- PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" -- -+-- "iso-amsc.gml" -- -+-- -- -+-- PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN"-- -+-- "iso-amsn.gml" -- -+-- -- -+-- PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" -- -+-- "iso-amso.gml" -- -+-- -- -+-- PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" -- -+-- "iso-amsr.gml" -- -+-- -- -+-- PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" -- -+-- "iso-box.gml" -- -+-- -- -+-- PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" -- -+-- "iso-cyr1.gml" -- -+-- -- -+-- PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" -- -+-- "iso-cyr2.gml" -- - - -- End of catalog data for DocBook V4.3 ................................. -- - -- ...................................................................... -- - -Diff finished. Fri Jun 4 15:43:33 2004 diff --git a/docbook_4.changes b/docbook_4.changes index 342051d..579d8bd 100644 --- a/docbook_4.changes +++ b/docbook_4.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Mon Jul 15 06:02:47 UTC 2013 - toms@opensuse.org + +- Fixed bnc#828872: + Missing system identifier http://www.docbook.org/xml/$VER/ added + +- Spec file: + Removed docbook-4-3-cat.diff patch as it is obsolete now + Removed obsoletes and provides of docbk_4; don't use it anymore! + Removed libxml2 dependency; this is already covered with xml-catalog + ------------------------------------------------------------------- Fri Feb 1 18:52:07 UTC 2013 - coolo@suse.com diff --git a/docbook_4.spec b/docbook_4.spec index faa97a2..7bba73a 100644 --- a/docbook_4.spec +++ b/docbook_4.spec @@ -20,13 +20,10 @@ Name: docbook_4 BuildRequires: fdupes BuildRequires: sgml-skel BuildRequires: unzip -Provides: docbk_4 Provides: docbook Provides: docbook-dtd Provides: docbook-dtds -Obsoletes: docbk_4 Requires: iso_ent -Requires: libxml2 %define regcat /usr/bin/sgml-register-catalog PreReq: %{regcat} /usr/bin/xmlcatalog sgml-skel PreReq: sed grep awk @@ -66,7 +63,7 @@ Source451: http://www.oasis-open.org/docbook/xml/4.5/docbook-xml-4.5.zip Source452: http://www.docbook.org/rng/4.5/docbook-rng-4.5.zip Source453: http://www.docbook.org/xsd/4.5/docbook-xsd-4.5.zip Source454: CATALOG.db45xml -Patch0: docbook-4-3-cat.diff +# Patches Patch1: docbook-4-3.diff Patch2: docbook-4-3-xml-cat.diff Patch3: docbook.4.4.dcl.diff @@ -178,6 +175,9 @@ $xmlcatbin --noout --add "public" \ $xmlcatbin --noout --add "rewriteSystem" \ "http://www.oasis-open.org/docbook/xml/4.1.2" \ "file://$docbookdir" $CATALOG +$xmlcatbin --noout --add "rewriteSystem" \ + "http://www.docbook.org/xml/4.1.2" \ + "file://$docbookdir" $CATALOG $xmlcatbin --noout --add "rewriteURI" \ "http://www.oasis-open.org/docbook/xml/4.1.2" \ "file://$docbookdir" $CATALOG @@ -272,12 +272,18 @@ for v in 4.2 4.3 4.4 4.5; do $xmlcatbin --noout --add "delegateSystem" \ "http://www.oasis-open.org/docbook/xml/${v}" \ "file://$cat42" %{FOR_ROOT_CAT}.tmp + $xmlcatbin --noout --add "delegateSystem" \ + "http://www.docbook.org/xml/${v}" \ + "file://$cat42" %{FOR_ROOT_CAT}.tmp $xmlcatbin --noout --add "delegateURI" \ "http://www.oasis-open.org/docbook/xml/${v}" \ "file://$cat42" %{FOR_ROOT_CAT}.tmp $xmlcatbin --noout --add "rewriteSystem" \ "http://www.oasis-open.org/docbook/xml/${v}" \ "file://%{xml_docbook_dtd_dir}/${v}" %{FOR_ROOT_CAT}.tmp + $xmlcatbin --noout --add "rewriteSystem" \ + "http://www.docbook.org/xml/${v}" \ + "file://%{xml_docbook_dtd_dir}/${v}" %{FOR_ROOT_CAT}.tmp $xmlcatbin --noout --add "delegatePublic" \ "ISO 8879:1986" \ "file:///$CATALOG" %{FOR_ROOT_CAT}.tmp @@ -408,8 +414,6 @@ fi %config %{xml_sysconf_dir}/%{FOR_ROOT_CAT} %dir %{sgml_dir}/docbook/dtd %{sgml_dir}/docbook_4.1 -# %dir %{xml_dir} -# %dir %{xml_docbook_dir} %dir %{xml_docbook_dir}/schema %dir %{xml_docbook_dtd_dir} %dir %{xml_docbook_rng_dir}