commit docbook_5 for openSUSE:Factory
Hello community,
here is the log from the commit of package docbook_5 for openSUSE:Factory
checked in at 2020-09-03 01:13:36
Comparing /work/SRC/openSUSE:Factory/docbook_5 (Old)
and /work/SRC/openSUSE:Factory/.docbook_5.new.3399 (New)
Package is "docbook_5"
Thu Sep 3 01:13:36 2020 rev:29 rq:830837 version:5.2b10a2
Changes:
--- /work/SRC/openSUSE:Factory/docbook_5/docbook_5.changes 2017-12-10
18:16:32.749764346 +0100
+++ /work/SRC/openSUSE:Factory/.docbook_5.new.3399/docbook_5.changes
2020-09-03 01:14:34.596479874 +0200
@@ -1,0 +2,28 @@
+Mon Aug 31 13:45:10 UTC 2020 - Thomas Schraitle -
5.2b10a2
+
+- Spec improvements:
+ move creating of compatibility links (5.2b10a2 -> 5.2) from spec
+ file into Makefile
+
+---
+Thu Aug 6 12:51:10 UTC 2020 - mmuschner - 5.2b10a2
+
+Update to version 5.2b10a2:
+ - Added a transform attribute to the resource element (as an alternative to
grammar).
+ - Removed the grammar attribute from output.
+ - Added a danger admonition.
+ - Added a legalsection sectioning element. Allow legalsection in legalnotice.
+ - Added an otherclass attribute to article as an alternative to the
enumerated class values.
+ - Added a formalgroup element to contain several formal objects (for example,
subfigures in a figure).
+ - Relaxed the content model of abstract to include non-paragraph block
elements.
+ - Added multimediaparams to imagedata.
+ - Added a buildtarget inline.
+ - Allow funcdef to contain an explicit void.
+ - Allow paramdef to contain modifiers.
+ - Allow fieldsynopsis, methodsynopsis, and methodparam to contain more than
one type.
+ - Extended the content model of type so that it can represent union and
intersection types. Added a class attribute to type.
+ - Allow numbered sections (sect1, sect2, etc.) to contain refentry.
+ - Added interface to the enumerated values in the class attribute of
systemitem.-
+ - Fix XML catalog to allow both www.docbook.org and docbook.org as URIs.
+
+---
New:
docbook_5.2b10a2.tar.bz2
Other differences:
--
++ docbook_5.spec ++
--- /var/tmp/diff_new_pack.K42qmJ/_old 2020-09-03 01:14:36.236480478 +0200
+++ /var/tmp/diff_new_pack.K42qmJ/_new 2020-09-03 01:14:36.240480479 +0200
@@ -1,7 +1,7 @@
#
# spec file for package docbook_5
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,35 +12,35 @@
# license that conforms to the Open Source Definition (Version 1.9)
# 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/
#
-%define schemaversions 5.0 5.1
-%define lastschemaversion 5.1
+%define schemaversions 5.0 5.1 5.2b10a2
+%define lastschemaversion 5.2b10a2
#
Name: docbook_5
-Version:5.1.0
+Version:5.2b10a2
Release:0
Summary:DocBook Schemas (DTD, RELAX NG, W3C Schema) for Version 5.x
License:SUSE-Oasis-Specification-Notice
Group: Productivity/Publishing/DocBook
-Url:http://www.oasis-open.org/docbook/
+URL:https://www.oasis-open.org/docbook/
# XML Catalog Entry
Source1:%{name}.xml
Source2:%{name}-README.SUSE
# DocBook Sources
Source3:docbook-5.0-docs.tar.bz2
Source4:docbook-5.1-docs.tar.bz2
-Source5:Makefile
+Source6:Makefile
# DB 5.0
Source500: docbook-5.0.tar.bz2
# DB 5.1
Source510: docbook-5.1.tar.bz2
#
+Source520: docbook_5.2b10a2.tar.bz2
# PATCH-FIX-OPENSUSE docbook_5-nvdl.patch change path to schema files
Patch501: %{name}-nvdl.patch
-
#
BuildRequires: fdupes
BuildRequires: sgml-skel
@@ -83,11 +83,12 @@
%prep
%setup -q -n %{name} -c -T
# Copy catalog, README, and Makefile
-cp -p %{SOURCE1} %{SOURCE2} %{SOURCE5} .
+cp -p %{SOURCE1} %{SOURCE2} %{SOURCE6} .
# Unpack the sources:
tar -xf %{SOURCE500}
tar -xf %{SOURCE510}
+tar -xf %{SOURCE520}
# Unpack the documentation:
tar -xf %{SOURCE3}
tar -xf %{SOURCE4}
@@ -131,9 +132,17 @@
%{xml_docbook_xsd_dir}/5.0
%{xml_docbook_nvdl_dir}/5.0
# 5.1
-%{xml_docbook_rng_dir}/%{lastschemaversion}
+%{xml_docbook_rng_dir}/5.1
+%{xml_docbook_sch_dir}/5.1
+%{xml_docbook_nvdl_dir}/5.1
+#5.2b10a2
%{xml_docbook_sch_dir}/%{lastschemaversion}
+%{xml_docbook_rng_dir}/%{lastschemaversion}
%{xml_docbook_nvdl_dir}/%{lastschemaversion}
+#5.2
+%{xml_docbook_sch_dir}/5.2
+%{xml_docbook_rng_dir}/5.2
commit docbook_5 for openSUSE:Factory
Hello community,
here is the log from the commit of package docbook_5 for openSUSE:Factory
checked in at 2017-12-10 18:16:28
Comparing /work/SRC/openSUSE:Factory/docbook_5 (Old)
and /work/SRC/openSUSE:Factory/.docbook_5.new (New)
Package is "docbook_5"
Sun Dec 10 18:16:28 2017 rev:28 rq:555499 version:5.1.0
Changes:
--- /work/SRC/openSUSE:Factory/docbook_5/docbook_5.changes 2017-12-05
01:27:35.947050899 +0100
+++ /work/SRC/openSUSE:Factory/.docbook_5.new/docbook_5.changes 2017-12-10
18:16:32.749764346 +0100
@@ -1,0 +2,6 @@
+Fri Dec 8 22:12:24 UTC 2017 - dims...@opensuse.org
+
+- Fix fdupes macro invocation: the fdupes macro knows no -q
+ parameter.
+
+---
Other differences:
--
++ docbook_5.spec ++
--- /var/tmp/diff_new_pack.HX2EYm/_old 2017-12-10 18:16:34.317689665 +0100
+++ /var/tmp/diff_new_pack.HX2EYm/_new 2017-12-10 18:16:34.317689665 +0100
@@ -105,7 +105,7 @@
make DESTDIR=%{buildroot}
# cleanup
-%fdupes -q %{buildroot}
+%fdupes %{buildroot}
%post
update-xml-catalog
commit docbook_5 for openSUSE:Factory
Hello community,
here is the log from the commit of package docbook_5 for openSUSE:Factory
checked in at 2017-12-05 01:27:34
Comparing /work/SRC/openSUSE:Factory/docbook_5 (Old)
and /work/SRC/openSUSE:Factory/.docbook_5.new (New)
Package is "docbook_5"
Tue Dec 5 01:27:34 2017 rev:27 rq:545075 version:5.1.0
Changes:
--- /work/SRC/openSUSE:Factory/docbook_5/docbook_5.changes 2017-10-18
12:49:53.068898631 +0200
+++ /work/SRC/openSUSE:Factory/.docbook_5.new/docbook_5.changes 2017-12-05
01:27:35.947050899 +0100
@@ -0,0 +1,12 @@
+---
+Sun Nov 12 17:02:51 UTC 2017 - thomas.schrai...@suse.com
+
+- Correct Makefile:
+ - Add more pattern rules
+ - Use more builtin make functions
+ - Create links in nvdl directory to docbook.{rng,sch}
+ - Add missing assembly.rn{c,g} and dbits.rn{c,g} for Schematron
+
+- Correct spec file:
+ - Add docbook_5-nvdl.patch to change path to DocBook RNG/SCH files
+ - Apply spec-cleaner
New:
docbook_5-nvdl.patch
Other differences:
--
++ docbook_5.spec ++
--- /var/tmp/diff_new_pack.cceqxh/_old 2017-12-05 01:27:37.031011518 +0100
+++ /var/tmp/diff_new_pack.cceqxh/_new 2017-12-05 01:27:37.035011374 +0100
@@ -27,8 +27,8 @@
Group: Productivity/Publishing/DocBook
Url:http://www.oasis-open.org/docbook/
# XML Catalog Entry
-Source1:docbook_5.xml
-Source2:docbook_5-README.SUSE
+Source1:%{name}.xml
+Source2:%{name}-README.SUSE
# DocBook Sources
Source3:docbook-5.0-docs.tar.bz2
Source4:docbook-5.1-docs.tar.bz2
@@ -38,6 +38,10 @@
# DB 5.1
Source510: docbook-5.1.tar.bz2
#
+# PATCH-FIX-OPENSUSE docbook_5-nvdl.patch change path to schema files
+Patch501: %{name}-nvdl.patch
+
+#
BuildRequires: fdupes
BuildRequires: sgml-skel
Requires: sgml-skel >= 0.7
@@ -91,6 +95,9 @@
chmod -R a+rX,g-w,o-w .
find . -type f | xargs chmod a-x
+# Patching
+%patch501
+
%build
# Nothing to build
@@ -98,7 +105,7 @@
make DESTDIR=%{buildroot}
# cleanup
-%fdupes %{buildroot}
+%fdupes -q %{buildroot}
%post
update-xml-catalog
++ Makefile ++
--- /var/tmp/diff_new_pack.cceqxh/_old 2017-12-05 01:27:37.075009920 +0100
+++ /var/tmp/diff_new_pack.cceqxh/_new 2017-12-05 01:27:37.075009920 +0100
@@ -12,78 +12,133 @@
SHELL := /bin/bash
PACKAGE := docbook_5
VERSION := 5.1
+DB_VERSIONS := 5.0 5.1
+LAST_VER := $(lastword $(DB_VERSIONS))
CDIR := $(shell pwd)
#
-DATADIR := $(PREFIX)/share
+DATADIR := $(DESTDIR)$(PREFIX)/share
#
BINDIR:= $(DESTDIR)$(PREFIX)/bin
# Catalog stuff
-DB_CATALOG_SRC := $(PACKAGE).xml
-CATALOG_DIR:= $(DESTDIR)/etc/xml/catalog.d
-DB_CATALOG := $(CATALOG_DIR)/$(DB_CATALOG_SRC)
+DB_CATALOG_SRC := $(PACKAGE).xml
+XML_CATALOG_DIR := $(DESTDIR)/etc/xml/catalog.d
+DB_CATALOG := $(XML_CATALOG_DIR)/$(DB_CATALOG_SRC)
#
-DB_XML_PATH := $(DESTDIR)$(DATADIR)/xml/docbook
+DB_XML_PATH := $(DATADIR)/xml/docbook
SCHEMA_PATH := $(DB_XML_PATH)/schema
#
XSLT_PATH := $(DB_XML_PATH)/stylesheet/upgrade
#
DTD_PATH := $(SCHEMA_PATH)/dtd
+XSD_PATH := $(SCHEMA_PATH)/xsd
RNG_PATH := $(SCHEMA_PATH)/rng
SCH_PATH := $(SCHEMA_PATH)/sch
-XSD_PATH := $(SCHEMA_PATH)/xsd
NVDL_PATH := $(SCHEMA_PATH)/nvdl
#
-PATHS_50 := $(DTD_PATH)/5.0 $(RNG_PATH)/5.0 $(SCH_PATH)/5.0
$(XSD_PATH)/5.0 $(NVDL_PATH)/5.0
-PATHS_51 := $(RNG_PATH)/5.1 $(SCH_PATH)/5.1 $(NVDL_PATH)/5.1
-#
-DB_VERSIONS := 5.0 5.1
+DB_DTD_PATHS := $(DTD_PATH)/5.0
+DB_XSD_PATHS := $(XSD_PATH)/5.0
+DB_RNG_PATHS := $(foreach v,$(DB_VERSIONS),$(RNG_PATH)/$(v))
+DB_SCH_PATHS := $(foreach v,$(DB_VERSIONS),$(SCH_PATH)/$(v))
+DB_NVDL_PATHS := $(foreach v,$(DB_VERSIONS),$(NVDL_PATH)/$(v))
+
+
+INST_DIRECTORIES := $(XML_CATALOG_DIR) $(BINDIR) $(XSLT_PATH) \
+ $(DB_DTD_PATHS) $(DB_XSD_PATHS) $(DB_RNG_PATHS)
$(DB_SCH_PATHS) $(DB_NVDL_PATHS)
+
+DTD_SCHEMAS := $(wildcard docbook-5.0/dtd/*.dtd)
+DTD_SCHEMAS := $(patsubst docbook-5.0/dtd/%,%,$(DTD_SCHEMAS))
+DTD_SCHEMAS := $(addprefix $(DB_DTD_PATHS)/,$(DTD_SCHEMAS))
+#
+XSD_SCHEMAS := $(wildcard docbook-5.0/xsd/*.xsd)
+XSD_SCHEMAS := $(patsubst docbook-5.0/xsd/%,%,$(XSD_SCHEMAS))
+XSD_SCHEMAS := $(addprefix $(DB_XSD_PATHS)/,$(XSD_SCHEMAS))
+#
+NVDL_SCHEMAS := $(wildcard $(foreach v,$(DB_VERSIONS),docbook-$(v)/*.nvdl))
+NVDL_SCHEMAS := $(subst docbook-,,$(NVDL_SCHEMAS))
+NVDL_SCHEMAS := $(addprefix $(NVDL_PATH)/,$(NVDL_SCHEMAS))
+#
+SCH_SCHEMAS := $(wildcard $(foreach p,$(DB_VERSIONS),docbook-$(p)/sch/*))
+SCH_SCHEMAS := $(patsubst docbook-%,%,$(SCH_SCHEMAS))
+SCH_SCHEMAS := $(subst sch/,,$(SCH_SCHEMAS))
commit docbook_5 for openSUSE:Factory
Hello community,
here is the log from the commit of package docbook_5 for openSUSE:Factory
checked in at 2017-10-18 12:49:50
Comparing /work/SRC/openSUSE:Factory/docbook_5 (Old)
and /work/SRC/openSUSE:Factory/.docbook_5.new (New)
Package is "docbook_5"
Wed Oct 18 12:49:50 2017 rev:26 rq:533606 version:5.1.0
Changes:
--- /work/SRC/openSUSE:Factory/docbook_5/docbook_5.changes 2016-07-01
09:54:55.0 +0200
+++ /work/SRC/openSUSE:Factory/.docbook_5.new/docbook_5.changes 2017-10-18
12:49:53.068898631 +0200
@@ -0,0 +1,15 @@
+
+---
+Wed Oct 11 15:10:23 UTC 2017 - thomas.schrai...@suse.com
+
+- New version 5.1
+ - no DTD and XSD schemas for version 5.1 anymore!
+
+- Changes in spec file:
+ - used spec-cleaner
+ - removed obsolete stuff
+ - install files through Makefile
+ - install NVDL files under /usr/share/xml/docbook/schema/nvdl
+instead as "documentation"
+
+
Old:
docbook-5.0-spec-cd-01.html
docbook-5.0-spec-cd-01.pdf
docbook-5.0-spec-cd-01.xml
docbook-5.1CR3.tar.bz2
New:
Makefile
docbook-5.0-docs.tar.bz2
docbook-5.1-docs.tar.bz2
docbook-5.1.tar.bz2
Other differences:
--
++ docbook_5.spec ++
--- /var/tmp/diff_new_pack.Lkxibk/_old 2017-10-18 12:49:54.044852921 +0200
+++ /var/tmp/diff_new_pack.Lkxibk/_new 2017-10-18 12:49:54.048852734 +0200
@@ -1,7 +1,7 @@
#
# spec file for package docbook_5
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 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
@@ -16,38 +16,41 @@
#
+%define schemaversions 5.0 5.1
+%define lastschemaversion 5.1
+#
Name: docbook_5
+Version:5.1.0
+Release:0
Summary:DocBook Schemas (DTD, RELAX NG, W3C Schema) for Version 5.x
License:SUSE-Oasis-Specification-Notice
Group: Productivity/Publishing/DocBook
-Version:5.1CR3
-Release:0
-BuildRequires: fdupes
-BuildRequires: sgml-skel
-Requires: sgml-skel >= 0.7
-Requires(post): sgml-skel >= 0.7
-Requires(postun): sgml-skel >= 0.7
+Url:http://www.oasis-open.org/docbook/
# XML Catalog Entry
Source1:docbook_5.xml
Source2:docbook_5-README.SUSE
-# DocBook Specifications:
-Source3:docbook-5.0-spec-cd-01.pdf
-Source4:docbook-5.0-spec-cd-01.html
-Source5:docbook-5.0-spec-cd-01.xml
+# DocBook Sources
+Source3:docbook-5.0-docs.tar.bz2
+Source4:docbook-5.1-docs.tar.bz2
+Source5:Makefile
# DB 5.0
Source500: docbook-5.0.tar.bz2
-# DB 5.1CR3
-Source510: docbook-5.1CR3.tar.bz2
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
+# DB 5.1
+Source510: docbook-5.1.tar.bz2
+#
+BuildRequires: fdupes
+BuildRequires: sgml-skel
+Requires: sgml-skel >= 0.7
+Requires(post): sgml-skel >= 0.7
+Requires(postun): sgml-skel >= 0.7
BuildArch: noarch
-Url:http://www.oasis-open.org/docbook/
-
-%define schemaversions 5.0 5.1
-%define lastschemaversion 5.1
%description
-The version 5.0 release is a complete rewrite of DocBook in RELAX NG.
+DocBook is a schema. It is particularly well-suited to books and papers
+about computer hardware and software (though it is not limited to these
+applications at all).
+
+The version is a complete rewrite of DocBook in RELAX NG.
The intent of this rewrite is to produce a schema that is true to the
spirit of DocBook while simultaneously removing inconsistencies that
have arisen as a natural consequence of DocBook's long, slow evolution.
@@ -58,12 +61,8 @@
BuildArch: noarch
%description doc
-The documentation for the DocBook 5.x specification (%schemaversions)
+The documentation for the DocBook 5.x specification (%{schemaversions})
-%define INSTALL install -m755 -s
-%define INSTALL_DIR install -d -m755
-%define INSTALL_DATAinstall -m644
-%define INSTALL_SCRIPT install -m755
%define xml_dir%{_datadir}/xml
%define xml_docbook_dir%{xml_dir}/docbook
%define xml_schema_dir %{xml_dir}/docbook/schema
@@ -71,130 +70,35 @@
%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_nvdl_dir %{xml_schema_dir}/nvdl
%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
+%define xml_config_dir %{_localstatedir}/lib/xml
%define xml_sysconf_dir
commit docbook_5 for openSUSE:Factory
Hello community,
here is the log from the commit of package docbook_5 for openSUSE:Factory
checked in at 2016-07-01 09:54:54
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 2015-05-15
07:43:39.0 +0200
+++ /work/SRC/openSUSE:Factory/.docbook_5.new/docbook_5.changes 2016-07-01
09:54:55.0 +0200
@@ -1,0 +2,6 @@
+Fri Jun 17 12:00:51 UTC 2016 - fv...@suse.com
+
+- Split documentation into -doc subpackage
+- Use newer sgml-spec
+
+---
New:
docbook_5.xml
Other differences:
--
++ docbook_5.spec ++
--- /var/tmp/diff_new_pack.e6bv3S/_old 2016-07-01 09:54:56.0 +0200
+++ /var/tmp/diff_new_pack.e6bv3S/_new 2016-07-01 09:54:56.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package docbook_5
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 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
@@ -22,11 +22,13 @@
Group: Productivity/Publishing/DocBook
Version:5.1CR3
Release:0
-# Requires: libxml2
BuildRequires: fdupes
BuildRequires: sgml-skel
-PreReq: /usr/bin/xmlcatalog sgml-skel
-PreReq: sed grep awk
+Requires: sgml-skel >= 0.7
+Requires(post): sgml-skel >= 0.7
+Requires(postun): sgml-skel >= 0.7
+# XML Catalog Entry
+Source1:docbook_5.xml
Source2:docbook_5-README.SUSE
# DocBook Specifications:
Source3:docbook-5.0-spec-cd-01.pdf
@@ -50,6 +52,14 @@
spirit of DocBook while simultaneously removing inconsistencies that
have arisen as a natural consequence of DocBook's long, slow evolution.
+%package doc
+Summary:Documentation for %{name}
+Group: Documentation/HTML
+BuildArch: noarch
+
+%description doc
+The documentation for the DocBook 5.x specification (%schemaversions)
+
%define INSTALL install -m755 -s
%define INSTALL_DIR install -d -m755
%define INSTALL_DATAinstall -m644
@@ -68,6 +78,8 @@
%prep
%setup -n %{name} -c -T
+# Copy catalog
+cp -p %{S:1} .
# Copy README
cp -p %{S:2} .
# Copy the DocBook Specifications:
@@ -82,55 +94,7 @@
find . -type f | xargs chmod a-x
%build
-# # build root catalog fragment
xmlcatbin=/usr/bin/xmlcatalog
-CATALOG=%{name}.xml
-$xmlcatbin --create --noout $CATALOG
-
-# Iterate over all versions...
-for v in %{schemaversions}; 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}
-
- # 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
@@ -193,57 +157,14 @@
done
done
-%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 %{schemaversions}; do
-
- cat=%{xml_docbook_dtd_dir}/${v}/catalog.xml
-# 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; \
-
commit docbook_5 for openSUSE:Factory
Hello community,
here is the log from the commit of package docbook_5 for openSUSE:Factory
checked in at 2015-05-15 07:43:33
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 2015-02-20
12:01:35.0 +0100
+++ /work/SRC/openSUSE:Factory/.docbook_5.new/docbook_5.changes 2015-05-15
07:43:39.0 +0200
@@ -1,0 +2,5 @@
+Tue May 12 12:44:54 UTC 2015 - t...@opensuse.org
+
+- Changed DocBook catalog URIs to 5.1 instead of 5.1CR3
+
+---
Other differences:
--
++ docbook_5.spec ++
--- /var/tmp/diff_new_pack.nYQHF6/_old 2015-05-15 07:43:40.0 +0200
+++ /var/tmp/diff_new_pack.nYQHF6/_new 2015-05-15 07:43:40.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package docbook_5
#
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 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
@@ -41,7 +41,8 @@
BuildArch: noarch
Url:http://www.oasis-open.org/docbook/
-%define versions 5.0 5.1CR3
+%define schemaversions 5.0 5.1
+%define lastschemaversion 5.1
%description
The version 5.0 release is a complete rewrite of DocBook in RELAX NG.
@@ -75,6 +76,8 @@
tar -xjf %{S:500}
tar -xjf %{S:510}
+mv docbook-%{version} docbook-%{lastschemaversion}
+
chmod -R a+rX,g-w,o-w .
find . -type f | xargs chmod a-x
@@ -85,7 +88,7 @@
$xmlcatbin --create --noout $CATALOG
# Iterate over all versions...
-for v in %{versions}; do
+for v in %{schemaversions}; do
docbookdir=%{xml_docbook_dtd_dir}/${v}
@@ -132,7 +135,7 @@
# -
# Build XML catalog files for each Schema
-for v in %{versions}; do
+for v in %{schemaversions}; do
for s in dtd rng sch xsd; do
cat=docbook-${v}/${s}/catalog.xml
@@ -195,7 +198,8 @@
rm -f %{FOR_ROOT_CAT}.tmp
$xmlcatbin --noout --create %{FOR_ROOT_CAT}.tmp
-for v in %{versions}; do
+for v in %{schemaversions}; do
+
cat=%{xml_docbook_dtd_dir}/${v}/catalog.xml
# DTDs
$xmlcatbin --noout --add delegatePublic \
@@ -223,7 +227,6 @@
file://%{xml_docbook_sch_dir}/${v}/catalog.xml \
%{FOR_ROOT_CAT}.tmp
done
-
done
# Create tag
@@ -242,7 +245,7 @@
%{INSTALL_DIR} $cat_dir
%{INSTALL_DATA} %{FOR_ROOT_CAT} %{name}.xml $cat_dir
-for v in %{versions}; do
+for v in %{schemaversions}; do
# Create directories
mkdir -p $RPM_BUILD_ROOT%{xml_docbook_dtd_dir}/$v \
$RPM_BUILD_ROOT%{xml_docbook_rng_dir}/$v \
@@ -296,7 +299,7 @@
%doc *README*
%doc docbook-5.0-spec-cd-01.{pdf,html,xml}
# Use the last version of DocBook:
-%doc docbook-5.0/docs/* docbook-%{version}/docbook.nvdl
+%doc docbook-5.0/docs/* docbook-%{lastschemaversion}/docbook.nvdl
#%%{sgml_dir}/CATALOG.*
%dir %{xml_docbook_dir}/schema
%dir %{xml_docbook_dtd_dir}
@@ -311,10 +314,10 @@
%{xml_docbook_xsd_dir}/5.0
%{xml_docbook_style_dir}/upgrade
# 5.1CR3
-%{xml_docbook_dtd_dir}/5.1CR3
-%{xml_docbook_rng_dir}/5.1CR3
-%{xml_docbook_sch_dir}/5.1CR3
-%{xml_docbook_xsd_dir}/5.1CR3
+%{xml_docbook_dtd_dir}/%{lastschemaversion}
+%{xml_docbook_rng_dir}/%{lastschemaversion}
+%{xml_docbook_sch_dir}/%{lastschemaversion}
+%{xml_docbook_xsd_dir}/%{lastschemaversion}
%{_bindir}/db4-entities.pl
commit docbook_5 for openSUSE:Factory
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.0 +0100
+++ /work/SRC/openSUSE:Factory/.docbook_5.new/docbook_5.changes 2015-02-20
12:01:35.0 +0100
@@ -1,0 +2,10 @@
+Tue Feb 19 11:35:00 UTC 2015 - t...@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.0 +0100
+++ /var/tmp/diff_new_pack.EpbDj1/_new 2015-02-20 12:01:36.0 +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; \
-
commit docbook_5 for openSUSE:Factory
Hello community, here is the log from the commit of package docbook_5 for openSUSE:Factory checked in at 2013-03-20 09:52:24 Comparing /work/SRC/openSUSE:Factory/docbook_5 (Old) and /work/SRC/openSUSE:Factory/.docbook_5.new (New) Package is docbook_5, Maintainer is thomas.schrai...@suse.com Changes: --- /work/SRC/openSUSE:Factory/docbook_5/docbook_5.changes 2012-06-06 16:06:25.0 +0200 +++ /work/SRC/openSUSE:Factory/.docbook_5.new/docbook_5.changes 2013-03-20 09:52:25.0 +0100 @@ -1,0 +2,12 @@ +Mon Mar 18 12:40:42 UTC 2013 - cfarr...@suse.com + +- license update: SUSE-Oasis-Specification-Notice + See any of the files in the docs/ subdirectory (section on notices and ip + towards the end) + +--- +Fri Mar 1 11:48:20 UTC 2013 - co...@suse.com + +- update license to new format + +--- Other differences: -- ++ docbook_5.spec ++ --- /var/tmp/diff_new_pack.YQ821e/_old 2013-03-20 09:52:30.0 +0100 +++ /var/tmp/diff_new_pack.YQ821e/_new 2013-03-20 09:52:30.0 +0100 @@ -1,7 +1,7 @@ # # spec file for package docbook_5 # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 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 @@ -15,9 +15,10 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: docbook_5 Summary:DocBook Schemas (DTD, RELAX NG, W3C Schema) for Version 5.x -License:BSD-3-Clause ; MIT +License:SUSE-Oasis-Specification-Notice Group: Productivity/Publishing/DocBook Version:5.0 Release:0 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit docbook_5 for openSUSE:Factory
Hello community, here is the log from the commit of package docbook_5 for openSUSE:Factory checked in at 2012-06-06 16:06:21 Comparing /work/SRC/openSUSE:Factory/docbook_5 (Old) and /work/SRC/openSUSE:Factory/.docbook_5.new (New) Package is docbook_5, Maintainer is thomas.schrai...@suse.com Changes: --- /work/SRC/openSUSE:Factory/docbook_5/docbook_5.changes 2011-09-23 01:55:47.0 +0200 +++ /work/SRC/openSUSE:Factory/.docbook_5.new/docbook_5.changes 2012-06-06 16:06:25.0 +0200 @@ -1,0 +2,5 @@ +Tue Jun 5 14:32:11 UTC 2012 - k...@suse.de + +- Reduce Requires (iso_ent and xmlcharent). + +--- Other differences: -- ++ docbook_5.spec ++ --- /var/tmp/diff_new_pack.ZrLwib/_old 2012-06-06 16:06:26.0 +0200 +++ /var/tmp/diff_new_pack.ZrLwib/_new 2012-06-06 16:06:26.0 +0200 @@ -1,7 +1,7 @@ # # spec file for package docbook_5 # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -15,15 +15,12 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - - Name: docbook_5 Summary:DocBook Schemas (DTD, RELAX NG, W3C Schema) for Version 5.x -Version:5.0 -Release:50 License:BSD-3-Clause ; MIT Group: Productivity/Publishing/DocBook -Requires: iso_ent xmlcharent +Version:5.0 +Release:0 Requires: libxml2 BuildRequires: sgml-skel PreReq: /usr/bin/xmlcatalog sgml-skel -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit docbook_5 for openSUSE:Factory
Hello community, here is the log from the commit of package docbook_5 for openSUSE:Factory checked in at 2011-12-06 18:06:39 Comparing /work/SRC/openSUSE:Factory/docbook_5 (Old) and /work/SRC/openSUSE:Factory/.docbook_5.new (New) Package is docbook_5, Maintainer is thomas.schrai...@suse.com Changes: Other differences: -- ++ docbook_5.spec ++ --- /var/tmp/diff_new_pack.hN3ULI/_old 2011-12-06 18:10:59.0 +0100 +++ /var/tmp/diff_new_pack.hN3ULI/_new 2011-12-06 18:10:59.0 +0100 @@ -21,7 +21,7 @@ Summary:DocBook Schemas (DTD, RELAX NG, W3C Schema) for Version 5.x Version:5.0 Release:50 -License:BSD 3-clause (or similar) ; MIT License (or similar) +License:BSD-3-Clause ; MIT Group: Productivity/Publishing/DocBook Requires: iso_ent xmlcharent Requires: libxml2 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit docbook_5 for openSUSE:Factory
Hello community,
here is the log from the commit of package docbook_5 for openSUSE:Factory
checked in at Mon Sep 19 16:45:55 CEST 2011.
--- docbook_5/docbook_5.changes 2009-08-03 12:58:38.0 +0200
+++ /mounts/work_src_done/STABLE/docbook_5/docbook_5.changes2011-09-18
19:33:52.0 +0200
@@ -1,0 +2,6 @@
+Sun Sep 18 17:17:12 UTC 2011 - jeng...@medozas.de
+
+- Remove redundant tags/sections from specfile
+ (cf. packaging guidelines)
+
+---
calling whatdependson for head-i586
Other differences:
--
++ docbook_5.spec ++
--- /var/tmp/diff_new_pack.bUwkOa/_old 2011-09-19 16:45:50.0 +0200
+++ /var/tmp/diff_new_pack.bUwkOa/_new 2011-09-19 16:45:50.0 +0200
@@ -1,7 +1,7 @@
#
-# spec file for package docbook_5 (Version 5.0)
+# spec file for package docbook_5
#
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 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
@@ -15,7 +15,6 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
Name: docbook_5
@@ -29,7 +28,6 @@
BuildRequires: sgml-skel
PreReq: /usr/bin/xmlcatalog sgml-skel
PreReq: sed grep awk
-AutoReqProv:on
Source2:docbook_5-README.SuSE
# DocBook Specifications:
Source3:docbook-%{version}-spec-cd-01.pdf
@@ -48,14 +46,6 @@
spirit of DocBook while simultaneously removing inconsistencies that
have arisen as a natural consequence of DocBook's long, slow evolution.
-
-
-Authors:
-
-Eve L. Maler e...@arbortext.com
-Terry Allen tal...@sonic.net
-Norman Walsh n...@nwalsh.com
-
%define INSTALL install -m755 -s
%define INSTALL_DIR install -d -m755
%define INSTALL_DATAinstall -m644
@@ -78,7 +68,7 @@
cp %{S:3} %{S:4} %{S:5} .
#
#unzip -q -a %{S:500}
-tar xjf %{S:500}
+tar -xjf %{S:500}
#
# CATALOG.* files
#cp %{S:504} .
@@ -333,9 +323,6 @@
--del %{name}-%{version}
fi
-%clean
-rm -fr $RPM_BUILD_ROOT
-
%files
%defattr(-, root, root)
#%config %{sgml_config_dir}/CATALOG.*
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
