Hello community,
here is the log from the commit of package docbook_5 for openSUSE:Factory checked in at 2015-02-20 12:01:35
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/docbook_5 (Old)
and /work/SRC/openSUSE:Factory/.docbook_5.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "docbook_5"
Changes:
--------
--- /work/SRC/openSUSE:Factory/docbook_5/docbook_5.changes 2013-03-20 09:52:25.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.docbook_5.new/docbook_5.changes 2015-02-20 12:01:35.000000000 +0100
@@ -1,0 +2,10 @@
+Tue Feb 19 11:35:00 UTC 2015 - toms@opensuse.org
+
+- Fixed subtle XML catalog bug (bsc#918565)
+- Added DocBook 5.1CR3
+- Spec file changes:
+ . Make post and postun sections work
+ . Lots of entries in XML catalogs need to be generated, so it's
+ easier to use for loops
+
+-------------------------------------------------------------------
Old:
----
docbook_5-README.SuSE
New:
----
docbook-5.1CR3.tar.bz2
docbook_5-README.SUSE
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ docbook_5.spec ++++++
--- /var/tmp/diff_new_pack.EpbDj1/_old 2015-02-20 12:01:36.000000000 +0100
+++ /var/tmp/diff_new_pack.EpbDj1/_new 2015-02-20 12:01:36.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package docbook_5
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -20,24 +20,29 @@
Summary: DocBook Schemas (DTD, RELAX NG, W3C Schema) for Version 5.x
License: SUSE-Oasis-Specification-Notice
Group: Productivity/Publishing/DocBook
-Version: 5.0
+Version: 5.1CR3
Release: 0
-Requires: libxml2
+# Requires: libxml2
+BuildRequires: fdupes
BuildRequires: sgml-skel
PreReq: /usr/bin/xmlcatalog sgml-skel
PreReq: sed grep awk
-Source2: docbook_5-README.SuSE
+Source2: docbook_5-README.SUSE
# DocBook Specifications:
-Source3: docbook-%{version}-spec-cd-01.pdf
-Source4: docbook-%{version}-spec-cd-01.html
-Source5: docbook-%{version}-spec-cd-01.xml
+Source3: docbook-5.0-spec-cd-01.pdf
+Source4: docbook-5.0-spec-cd-01.html
+Source5: docbook-5.0-spec-cd-01.xml
# DB 5.0
-Source500: http://www.docbook.org/xml/%{version}/docbook-%{version}.tar.bz2
-#Source504: CATALOG.db50CR1xml
+Source500: docbook-5.0.tar.bz2
+# DB 5.1CR3
+Source510: docbook-5.1CR3.tar.bz2
+
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
Url: http://www.oasis-open.org/docbook/
+%define versions 5.0 5.1CR3
+
%description
The version 5.0 release is a complete rewrite of DocBook in RELAX NG.
The intent of this rewrite is to produce a schema that is true to the
@@ -50,10 +55,11 @@
%define INSTALL_SCRIPT install -m755
%define xml_dir %{_datadir}/xml
%define xml_docbook_dir %{xml_dir}/docbook
-%define xml_docbook_dtd_dir %{xml_docbook_dir}/schema/dtd
-%define xml_docbook_rng_dir %{xml_docbook_dir}/schema/rng
-%define xml_docbook_sch_dir %{xml_docbook_dir}/schema/sch
-%define xml_docbook_xsd_dir %{xml_docbook_dir}/schema/xsd
+%define xml_schema_dir %{xml_dir}/docbook/schema
+%define xml_docbook_dtd_dir %{xml_schema_dir}/dtd
+%define xml_docbook_rng_dir %{xml_schema_dir}/rng
+%define xml_docbook_sch_dir %{xml_schema_dir}/sch
+%define xml_docbook_xsd_dir %{xml_schema_dir}/xsd
%define xml_docbook_custom_dir %{xml_docbook_dir}/custom
%define xml_docbook_style_dir %{xml_docbook_dir}/stylesheet
%define xml_config_dir /var/lib/xml
@@ -61,15 +67,14 @@
%prep
%setup -n %{name} -c -T
-cp -p $RPM_SOURCE_DIR/%{name}-README.SuSE README.SuSE
+# Copy README
+cp -p %{S:2} .
# Copy the DocBook Specifications:
cp %{S:3} %{S:4} %{S:5} .
-#
-#unzip -q -a %{S:500}
+
tar -xjf %{S:500}
-#
-# CATALOG.* files
-#cp %{S:504} .
+tar -xjf %{S:510}
+
chmod -R a+rX,g-w,o-w .
find . -type f | xargs chmod a-x
@@ -78,200 +83,149 @@
xmlcatbin=/usr/bin/xmlcatalog
CATALOG=%{name}.xml
$xmlcatbin --create --noout $CATALOG
-for v in %{version}; do
- # DTD
+
+# Iterate over all versions...
+for v in %{versions}; do
+
+ docbookdir=%{xml_docbook_dtd_dir}/${v}
+
$xmlcatbin --noout --add "public" \
"-//OASIS//DTD DocBook XML ${v}//EN" \
"file://%{xml_docbook_dtd_dir}/${v}/docbook.dtd" ${CATALOG}
- $xmlcatbin --noout --add "system" \
- "http://www.oasis-open.org/docbook/xml/${v}/dtd/docbook.dtd" \
- "file://%{xml_docbook_dtd_dir}/${v}/docbook.dtd" ${CATALOG}
- $xmlcatbin --noout --add "system" \
- "http://docbook.org/xml/${v}/dtd/docbook.dtd" \
- "file://%{xml_docbook_dtd_dir}/${v}/docbook.dtd" ${CATALOG}
- # RNG
- $xmlcatbin --noout --add "uri" \
- "http://www.oasis-open.org/docbook/xml/${v}/rng/docbook.rng" \
- "file://%{xml_docbook_rng_dir}/${v}/docbook.rng" ${CATALOG}
- $xmlcatbin --noout --add "uri" \
- "http://docbook.org/xml/${v}/rng/docbook.rng" \
- "file://%{xml_docbook_rng_dir}/${v}/docbook.rng" ${CATALOG}
- # RNG+XInclude
- $xmlcatbin --noout --add "uri" \
- "http://www.oasis-open.org/docbook/xml/${v}/rng/docbookxi.rng" \
- "file://%{xml_docbook_rng_dir}/${v}/docbookxi.rng" ${CATALOG}
- $xmlcatbin --noout --add "uri" \
- "http://docbook.org/xml/${v}/rng/docbookxi.rng" \
- "file://%{xml_docbook_rng_dir}/${v}/docbookxi.rng" ${CATALOG}
- # RNC
- $xmlcatbin --noout --add "uri" \
- "http://www.oasis-open.org/docbook/xml/${v}/rnc/docbook.rnc" \
- "file://%{xml_docbook_rng_dir}/${v}/docbook.rnc" ${CATALOG}
- $xmlcatbin --noout --add "uri" \
- "http://docbook.org/xml/${v}/rng/docbook.rnc" \
- "file://%{xml_docbook_rng_dir}/${v}/docbook.rnc" ${CATALOG}
- # RNC+XInclude
- $xmlcatbin --noout --add "uri" \
- "http://www.oasis-open.org/docbook/xml/${v}/rnc/docbookxi.rnc" \
- "file://%{xml_docbook_rng_dir}/${v}/docbookxi.rnc" ${CATALOG}
- $xmlcatbin --noout --add "uri" \
- "http://docbook.org/xml/${v}/rng/docbookxi.rnc" \
- "file://%{xml_docbook_rng_dir}/${v}/docbookxi.rnc" ${CATALOG}
- # XSD
- $xmlcatbin --noout --add "uri" \
- "http://www.oasis-open.org/docbook/xml/${v}/xsd/docbook.xsd" \
- "file://%{xml_docbook_xsd_dir}/${v}/docbook.xsd" ${CATALOG}
- $xmlcatbin --noout --add "uri" \
- "http://docbook.org/xml/${v}/xsd/docbook.xsd" \
- "file://%{xml_docbook_xsd_dir}/${v}/docbook.xsd" ${CATALOG}
- # XSD + XInclude
- $xmlcatbin --noout --add "uri" \
- "http://www.oasis-open.org/docbook/xml/${v}/xsd/docbookxi.xsd" \
- "file://%{xml_docbook_xsd_dir}/${v}/docbookxi.xsd" ${CATALOG}
- $xmlcatbin --noout --add "uri" \
- "http://docbook.org/xml/${v}/xsd/docbookxi.xsd" \
- "file://%{xml_docbook_xsd_dir}/${v}/docbookxi.xsd" ${CATALOG}
- $xmlcatbin --noout --add "uri" \
- "http://www.oasis-open.org/docbook/xml/${v}/xsd/xi.xsd" \
- "file://%{xml_docbook_xsd_dir}/${v}/xi.xsd" ${CATALOG}
- $xmlcatbin --noout --add "uri" \
- "http://docbook.org/xml/${v}/xsd/xi.xsd" \
- "file://%{xml_docbook_xsd_dir}/${v}/xi.xsd" ${CATALOG}
- # XLink + XML
- $xmlcatbin --noout --add "uri" \
- "http://www.oasis-open.org/docbook/xml/${v}/xsd/xlink.xsd" \
- "file://%{xml_docbook_xsd_dir}/${v}/xlink.xsd" ${CATALOG}
- $xmlcatbin --noout --add "uri" \
- "http://docbook.org/xml/${v}/xsd/xlink.xsd" \
- "file://%{xml_docbook_xsd_dir}/${v}/xlink.xsd" ${CATALOG}
- $xmlcatbin --noout --add "uri" \
- "http://www.oasis-open.org/docbook/xml/${v}/xsd/xml.xsd" \
- "file://%{xml_docbook_xsd_dir}/${v}/xml.xsd" ${CATALOG}
- $xmlcatbin --noout --add "uri" \
- "http://docbook.org/xml/${v}/xsd/xml.xsd" \
- "file://%{xml_docbook_xsd_dir}/${v}/xml.xsd" ${CATALOG}
- # Schematron
- $xmlcatbin --noout --add "uri" \
- "http://www.oasis-open.org/docbook/xml/${v}/sch/docbook.sch" \
- "file://%{xml_docbook_sch_dir}/${v}/docbook.sch" ${CATALOG}
- $xmlcatbin --noout --add "uri" \
- "http://docbook.org/xml/${v}/sch/docbook.sch" \
- "file://%{xml_docbook_sch_dir}/${v}/docbook.sch" ${CATALOG}
+
+ # We need to create lots of URIs...
+ for http in "http://www.oasis-open.org/docbook/xml" \
+ "http://www.docbook.org/xml" \
+ "http://docbook.org/xml" ; do
+# DTDs
+ $xmlcatbin --noout --add "rewriteSystem" \
+ "${http}/${v}" \
+ "file://$docbookdir" $CATALOG
+ $xmlcatbin --noout --add "rewriteURI" \
+ "${http}/${v}" \
+ "file://$docbookdir" $CATALOG
+# RNG, RNG+XInclude
+ $xmlcatbin --noout --add "rewriteSystem" \
+ "${http}/${v}/rng/" \
+ "file://%{xml_docbook_rng_dir}/${v}/" ${CATALOG}
+ $xmlcatbin --noout --add "rewriteURI" \
+ "${http}/${v}/rng/" \
+ "file://%{xml_docbook_rng_dir}/${v}/" ${CATALOG}
+# XSD, XSD+XInclude
+ $xmlcatbin --noout --add "rewriteSystem" \
+ "${http}/${v}/xsd/" \
+ "file://%{xml_docbook_xsd_dir}/${v}/" ${CATALOG}
+ $xmlcatbin --noout --add "rewriteURI" \
+ "${http}/${v}/xsd/" \
+ "file://%{xml_docbook_xsd_dir}/${v}/" ${CATALOG}
+# Schematron
+ $xmlcatbin --noout --add "rewriteSystem" \
+ "${http}/${v}/sch/" \
+ "file://%{xml_docbook_sch_dir}/${v}/" ${CATALOG}
+ $xmlcatbin --noout --add "rewriteURI" \
+ "${http}/${v}/sch/" \
+ "file://%{xml_docbook_sch_dir}/${v}/" ${CATALOG}
+ done
+
done
+
# ---------------------
# Build XML catalog files for each Schema
-for v in %{version}; do
+
+for v in %{versions}; do
+
for s in dtd rng sch xsd; do
cat=docbook-${v}/${s}/catalog.xml
$xmlcatbin --noout --create ${cat}
- case $s in
- dtd)
+
$xmlcatbin --noout --add "public" \
"-//OASIS//DTD DocBook XML ${v}//EN" \
"docbook.dtd" ${cat}
+
+ for http in "http://www.oasis-open.org/docbook/xml" \
+ "http://www.docbook.org/xml" \
+ "http://docbook.org/xml" ; do
+
+ case ${s} in
+ dtd)
$xmlcatbin --noout --add "system" \
- "http://www.oasis-open.org/docbook/xml/${v}/dtd/docbook.dtd" \
+ "${http}/${v}/dtd/docbook.dtd" \
"docbook.dtd" ${cat}
;;
- sch)
- $xmlcatbin --noout --add "uri" \
- "http://docbook.org/xml/${v}/${s}/docbook.${s}" \
- "docbook.${s}" ${cat}
- $xmlcatbin --noout --add "uri" \
- "http://www.oasis-open.org/docbook/xml/${v}/${s}/docbook.${s}" \
- "docbook.${s}" ${cat}
- ;;
rng)
+ for ff in docbook.rng docbook.rnc \
+ "docbookxi.${s}" docbookxi.rnc \
+ assembly.rng assembly.rnc \
+ dbits.rng dbits.rnc; do
+ $xmlcatbin --noout --add "system" \
+ "${http}/${v}/${s}/${ff}" \
+ "${ff}" ${cat}
$xmlcatbin --noout --add "uri" \
- "http://docbook.org/xml/${v}/${s}/docbook.${s}" \
+ "${http}/${v}/${s}/${ff}" \
+ "${ff}" ${cat}
+ done
+ ;;
+ sch)
+ $xmlcatbin --noout --add "system" \
+ "${http}/${v}/${s}/docbook.${s}" \
"docbook.${s}" ${cat}
$xmlcatbin --noout --add "uri" \
- "http://www.oasis-open.org/docbook/xml/${v}/${s}/docbook.${s}" \
+ "${http}/${v}/${s}/docbook.${s}" \
"docbook.${s}" ${cat}
- #
- $xmlcatbin --noout --add "uri" \
- "http://docbook.org/xml/${v}/${s}/docbookxi.${s}" \
- "docbookxi.${s}" ${cat}
- $xmlcatbin --noout --add "uri" \
- "http://www.oasis-open.org/docbook/xml/${v}/${s}/docbookxi.${s}" \
- "docbookxi.${s}" ${cat}
- #
- $xmlcatbin --noout --add "uri" \
- "http://docbook.org/xml/${v}/${s}/docbook.rnc" \
- "docbook.rnc" ${cat}
- $xmlcatbin --noout --add "uri" \
- "http://www.oasis-open.org/docbook/xml/${v}/${s}/docbook.rnc" \
- "docbook.rnc" ${cat}
- #
- $xmlcatbin --noout --add "uri" \
- "http://docbook.org/xml/${v}/${s}/docbookxi.rnc" \
- "docbookxi.rnc" ${cat}
- $xmlcatbin --noout --add "uri" \
- "http://www.oasis-open.org/docbook/xml/${v}/${s}/docbookxi.rnc" \
- "docbookxi.rnc" ${cat}
;;
xsd)
- # http://www.oasis-open.org/docbook/xml/5.0/xsd/docbookxi.xsd
- # http://www.oasis-open.org/docbook/xml/5.0/xsd/xlink.xsd
- $xmlcatbin --noout --add "uri" \
- "http://docbook.org/xml/${v}/${s}/docbook.${s}" \
- "docbook.${s}" ${cat}
- $xmlcatbin --noout --add "uri" \
- "http://www.oasis-open.org/docbook/xml/${v}/${s}/docbook.${s}" \
- "docbook.${s}" ${cat}
- #
- $xmlcatbin --noout --add "uri" \
- "http://docbook.org/xml/${v}/${s}/docbookxi.${s}" \
- "docbookxi.${s}" ${cat}
- $xmlcatbin --noout --add "uri" \
- "http://www.oasis-open.org/docbook/xml/${v}/${s}/docbookxi.${s}" \
- "docbookxi.${s}" ${cat}
- # XLink + XML:
- $xmlcatbin --noout --add "uri" \
- "http://docbook.org/xml/${v}/${s}/xlink.xsd" \
- "xlink.xsd" ${cat}
- $xmlcatbin --noout --add "uri" \
- "http://www.oasis-open.org/docbook/xml/${v}/${s}/xlink.xsd" \
- "xlink.xsd" ${cat}
- $xmlcatbin --noout --add "uri" \
- "http://docbook.org/xml/${v}/${s}/xml.xsd" \
- "xml.xsd" ${cat}
+ for ff in "docbook.${s}" "docbookxi.${s}" xlink.xsd xml.xsd; do
+ $xmlcatbin --noout --add "system" \
+ "${http}/${v}/${s}/${ff}" \
+ "${ff}" ${cat}
$xmlcatbin --noout --add "uri" \
- "http://www.oasis-open.org/docbook/xml/${v}/${s}/xml.xsd" \
- "xml.xsd" ${cat}
+ "${http}/${v}/${s}/${ff}" \
+ "${ff}" ${cat}
+ done
;;
esac
+
+ done
+
done
done
-%define FOR_ROOT_CAT %{name}-%{version}.xml
+
+%define FOR_ROOT_CAT for-catalog-%{name}-%{version}.xml
CATALOG=etc/xml/$CATALOG
rm -f %{FOR_ROOT_CAT}.tmp
$xmlcatbin --noout --create %{FOR_ROOT_CAT}.tmp
-for v in %{version}; do
+
+for v in %{versions}; do
cat=%{xml_docbook_dtd_dir}/${v}/catalog.xml
- # DTDs
+# DTDs
$xmlcatbin --noout --add "delegatePublic" \
"-//OASIS//DTD DocBook XML ${v}//EN" \
"file://%{xml_docbook_dtd_dir}/${v}/catalog.xml" \
%{FOR_ROOT_CAT}.tmp
+
+ for http in "http://www.oasis-open.org/docbook/xml" \
+ "http://www.docbook.org/xml" \
+ "http://docbook.org/xml" ; do
$xmlcatbin --noout --add "delegateSystem" \
- "http://docbook.org/xml/${v}/dtd/" \
+ "${http}/${v}/dtd/" \
"file://%{xml_docbook_dtd_dir}/${v}/catalog.xml" \
%{FOR_ROOT_CAT}.tmp
- #
- $xmlcatbin --noout --add "delegateURI" \
- "http://docbook.org/xml/${v}/rng/" \
+ $xmlcatbin --noout --add "delegateSystem" \
+ "${http}/${v}/rng/" \
"file://%{xml_docbook_rng_dir}/${v}/catalog.xml" \
%{FOR_ROOT_CAT}.tmp
- $xmlcatbin --noout --add "delegateURI" \
- "http://docbook.org/xml/${v}/xsd/" \
+ $xmlcatbin --noout --add "delegateSystem" \
+ "${http}/${v}/xsd/" \
"file://%{xml_docbook_xsd_dir}/${v}/catalog.xml" \
%{FOR_ROOT_CAT}.tmp
- $xmlcatbin --noout --add "delegateURI" \
- "http://docbook.org/xml/${v}/sch/" \
+ $xmlcatbin --noout --add "delegateSystem" \
+ "${http}/${v}/sch/" \
"file://%{xml_docbook_sch_dir}/${v}/catalog.xml" \
%{FOR_ROOT_CAT}.tmp
+ done
+
done
+
# Create tag
sed '/
participants (1)
-
root@hilbert.suse.de