From d308bfd3819a60e36f99401b13fe4811d2469a35 Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 04:19:59 +0000 Subject: [PATCH] auto-import changelog data from docbook-dtds-1.0-22.1.src.rpm Wed Aug 06 2003 Tim Waugh 1.0-22.1 - Rebuilt. Wed Aug 06 2003 Tim Waugh 1.0-22 - More work-arounds for buggy xmlcatalog. Tue Jul 15 2003 Tim Waugh 1.0-21.1 - Rebuilt. Tue Jul 15 2003 Tim Waugh 1.0-21 - Fix € in SGML tools. Wed May 28 2003 Tim Waugh 1.0-20 - Fix summary and description (bug #73005). Fri Mar 28 2003 Tim Waugh 1.0-19 - Use --parents in %doc. - Fix %postun scriptlet. Fri Mar 14 2003 Tim Waugh 1.0-18 - Use Requires:, not Conflicts:, for openjade. - Require openjade 1.3.2. --- docbook-4.2-euro.patch | 22 +++++ docbook-dtds.spec | 186 ++++++++++++++++------------------------- 2 files changed, 95 insertions(+), 113 deletions(-) create mode 100644 docbook-4.2-euro.patch diff --git a/docbook-4.2-euro.patch b/docbook-4.2-euro.patch new file mode 100644 index 0000000..bbace5d --- /dev/null +++ b/docbook-4.2-euro.patch @@ -0,0 +1,22 @@ +--- docbook-dtds-1.0/4.2-sgml/docbookx.dtd.euro 2003-07-15 09:07:58.000000000 +0100 ++++ docbook-dtds-1.0/4.2-sgml/docbookx.dtd 2003-07-15 09:08:12.000000000 +0100 +@@ -106,7 +106,7 @@ + ++ + ]]> + +--- docbook-dtds-1.0/4.2-xml/docbookx.dtd.euro 2003-07-15 09:08:02.000000000 +0100 ++++ docbook-dtds-1.0/4.2-xml/docbookx.dtd 2003-07-15 09:08:21.000000000 +0100 +@@ -106,7 +106,7 @@ + ++ + ]]> + diff --git a/docbook-dtds.spec b/docbook-dtds.spec index 26ea19a..08d92d4 100644 --- a/docbook-dtds.spec +++ b/docbook-dtds.spec @@ -1,9 +1,9 @@ Name: docbook-dtds Version: 1.0 -Release: 17 +Release: 22.1 Group: Applications/Text -Summary: XML document type definition for DocBook 4.1.2 +Summary: SGML and XML document type definitions for DocBook. License: Distributable URL: http://www.oasis-open.org/docbook/ @@ -45,18 +45,17 @@ Patch1: docbook-dtd31-sgml-1.0.catalog.patch Patch2: docbook-dtd40-sgml-1.0.catalog.patch Patch3: docbook-dtd41-sgml-1.0.catalog.patch Patch4: docbook-dtd42-sgml-1.0.catalog.patch +Patch5: docbook-4.2-euro.patch BuildRequires: unzip -%define openjadever 1.3.1 -Conflicts: openjade < %{openjadever} -Conflicts: openjade > %{openjadever} +%define openjadever 1.3.2 +Requires: openjade = %{openjadever} %description The DocBook Document Type Definition (DTD) describes the syntax of technical documentation texts (articles, books and manual pages). This syntax is XML-compliant and is developed by the OASIS consortium. -This package contains SGML and XML versions of the DocBook DTD up to -and including version 4.1.2. +This package contains SGML and XML versions of the DocBook DTD. %prep @@ -108,6 +107,9 @@ cd 4.2-xml unzip %{SOURCE6} cd .. +# Fix € in SGML. +%patch5 -p1 + if [ `id -u` -eq 0 ]; then chown -R root.root . chmod -R a+rX,g-w,o-w . @@ -204,9 +206,9 @@ rm -rf $RPM_BUILD_ROOT %files %defattr (-,root,root) -%doc 3.1-sgml/ChangeLog -%doc 4.1-sgml/ChangeLog -%doc */*.txt +%doc --parents 3.1-sgml/ChangeLog +%doc --parents 4.1-sgml/ChangeLog +%doc --parents */*.txt /usr/share/sgml/docbook/sgml-dtd-3.0-%{version}-%{release} /usr/share/sgml/docbook/sgml-dtd-3.1-%{version}-%{release} /usr/share/sgml/docbook/sgml-dtd-4.0-%{version}-%{release} @@ -568,121 +570,56 @@ fi # Update the centralized catalog corresponding to this version of the DTD # DocBook V3.0 -/usr/bin/xmlcatalog --sgml --noout --del \ - /etc/sgml/sgml-docbook-3.0-%{version}-%{release}.cat \ - /usr/share/sgml/sgml-iso-entities-8879.1986/catalog -/usr/bin/xmlcatalog --sgml --noout --del \ - /etc/sgml/sgml-docbook-3.0-%{version}-%{release}.cat \ - /usr/share/sgml/docbook/sgml-dtd-3.0-%{version}-%{release}/catalog +/usr/bin/xmlcatalog --sgml --noout --del /etc/sgml/catalog \ + /etc/sgml/sgml-docbook-3.0-%{version}-%{release}.cat +rm -f /etc/sgml/sgml-docbook-3.0-%{version}-%{release}.cat # DocBook V3.1 -/usr/bin/xmlcatalog --sgml --noout --del \ - /etc/sgml/sgml-docbook-3.1-%{version}-%{release}.cat \ - /usr/share/sgml/sgml-iso-entities-8879.1986/catalog -/usr/bin/xmlcatalog --sgml --noout --del \ - /etc/sgml/sgml-docbook-3.1-%{version}-%{release}.cat \ - /usr/share/sgml/docbook/sgml-dtd-3.1-%{version}-%{release}/catalog +/usr/bin/xmlcatalog --sgml --noout --del /etc/sgml/catalog \ + /etc/sgml/sgml-docbook-3.1-%{version}-%{release}.cat +rm -f /etc/sgml/sgml-docbook-3.1-%{version}-%{release}.cat # DocBook V4.0 -/usr/bin/xmlcatalog --sgml --noout --del \ - /etc/sgml/sgml-docbook-4.0-%{version}-%{release}.cat \ - /usr/share/sgml/sgml-iso-entities-8879.1986/catalog -/usr/bin/xmlcatalog --sgml --noout --del \ - /etc/sgml/sgml-docbook-4.0-%{version}-%{release}.cat \ - /usr/share/sgml/docbook/sgml-dtd-4.0-%{version}-%{release}/catalog +/usr/bin/xmlcatalog --sgml --noout --del /etc/sgml/catalog \ + /etc/sgml/sgml-docbook-4.0-%{version}-%{release}.cat +rm -f /etc/sgml/sgml-docbook-4.0-%{version}-%{release}.cat # DocBook V4.1 -/usr/bin/xmlcatalog --sgml --noout --del \ - /etc/sgml/sgml-docbook-4.1-%{version}-%{release}.cat \ - /usr/share/sgml/sgml-iso-entities-8879.1986/catalog -/usr/bin/xmlcatalog --sgml --noout --del \ - /etc/sgml/sgml-docbook-4.1-%{version}-%{release}.cat \ - /usr/share/sgml/docbook/sgml-dtd-4.1-%{version}-%{release}/catalog +/usr/bin/xmlcatalog --sgml --noout --del /etc/sgml/catalog \ + /etc/sgml/sgml-docbook-4.1-%{version}-%{release}.cat +rm -f /etc/sgml/sgml-docbook-4.1-%{version}-%{release}.cat # DocBook XML V4.1.2 -/usr/bin/xmlcatalog --sgml --noout --del \ - /etc/sgml/xml-docbook-4.1.2-%{version}-%{release}.cat \ - /usr/share/sgml/sgml-iso-entities-8879.1986/catalog -/usr/bin/xmlcatalog --sgml --noout --del \ - /etc/sgml/xml-docbook-4.1.2-%{version}-%{release}.cat \ - /usr/share/sgml/docbook/xml-dtd-4.1.2-%{version}-%{release}/catalog +/usr/bin/xmlcatalog --sgml --noout --del /etc/sgml/catalog \ + /etc/sgml/xml-docbook-4.1.2-%{version}-%{release}.cat +rm -f /etc/sgml/xml-docbook-4.1.2-%{version}-%{release}.cat # DocBook V4.2 -/usr/bin/xmlcatalog --sgml --noout --del \ - /etc/sgml/sgml-docbook-4.2-%{version}-%{release}.cat \ - /usr/share/sgml/sgml-iso-entities-8879.1986/catalog -/usr/bin/xmlcatalog --sgml --noout --del \ - /etc/sgml/sgml-docbook-4.2-%{version}-%{release}.cat \ - /usr/share/sgml/docbook/sgml-dtd-4.2-%{version}-%{release}/catalog +/usr/bin/xmlcatalog --sgml --noout --del /etc/sgml/catalog \ + /etc/sgml/sgml-docbook-4.2-%{version}-%{release}.cat +rm -f /etc/sgml/sgml-docbook-4.2-%{version}-%{release}.cat # DocBook XML V4.2 -/usr/bin/xmlcatalog --sgml --noout --del \ - /etc/sgml/xml-docbook-4.2-%{version}-%{release}.cat \ - /usr/share/sgml/sgml-iso-entities-8879.1986/catalog -/usr/bin/xmlcatalog --sgml --noout --del \ - /etc/sgml/xml-docbook-4.2-%{version}-%{release}.cat \ - /usr/share/sgml/docbook/xml-dtd-4.2-%{version}-%{release}/catalog +/usr/bin/xmlcatalog --sgml --noout --del /etc/sgml/catalog \ + /etc/sgml/xml-docbook-4.2-%{version}-%{release}.cat +rm -f /etc/sgml/xml-docbook-4.2-%{version}-%{release}.cat -# The following lines are for the case in which the style sheets -# were not uninstalled because there is still another DTD -STYLESHEETS=$(echo /usr/share/sgml/docbook/dsssl-stylesheets-*) -STYLESHEETS=${STYLESHEETS##*/dsssl-stylesheets-} -if [ "$STYLESHEETS" != "*" ]; then - # DocBook V3.0 - /usr/bin/xmlcatalog --sgml --noout --del \ - /etc/sgml/sgml-docbook-3.0-%{version}-%{release}.cat \ - /usr/share/sgml/openjade-%{openjadever}/catalog - /usr/bin/xmlcatalog --sgml --noout --del \ - /etc/sgml/sgml-docbook-3.0-%{version}-%{release}.cat \ - /usr/share/sgml/docbook/dsssl-stylesheets-$STYLESHEETS/catalog - - # DocBook V3.1 - /usr/bin/xmlcatalog --sgml --noout --del \ - /etc/sgml/sgml-docbook-3.1-%{version}-%{release}.cat \ - /usr/share/sgml/openjade-%{openjadever}/catalog - /usr/bin/xmlcatalog --sgml --noout --del \ - /etc/sgml/sgml-docbook-3.1-%{version}-%{release}.cat \ - /usr/share/sgml/docbook/dsssl-stylesheets-$STYLESHEETS/catalog - - # DocBook V4.0 - /usr/bin/xmlcatalog --sgml --noout --del \ - /etc/sgml/sgml-docbook-4.0-%{version}-%{release}.cat \ - /usr/share/sgml/openjade-%{openjadever}/catalog - /usr/bin/xmlcatalog --sgml --noout --del \ - /etc/sgml/sgml-docbook-4.0-%{version}-%{release}.cat \ - /usr/share/sgml/docbook/dsssl-stylesheets-$STYLESHEETS/catalog - - # DocBook V4.1 - /usr/bin/xmlcatalog --sgml --noout --del \ - /etc/sgml/sgml-docbook-4.1-%{version}-%{release}.cat \ - /usr/share/sgml/openjade-%{openjadever}/catalog - /usr/bin/xmlcatalog --sgml --noout --del \ - /etc/sgml/sgml-docbook-4.1-%{version}-%{release}.cat \ - /usr/share/sgml/docbook/dsssl-stylesheets-$STYLESHEETS/catalog - - # DocBook XML V4.1.2 - /usr/bin/xmlcatalog --sgml --noout --del \ - /etc/sgml/xml-docbook-4.1.2-%{version}-%{release}.cat \ - /usr/share/sgml/openjade-%{openjadever}/catalog - /usr/bin/xmlcatalog --sgml --noout --del \ - /etc/sgml/xml-docbook-4.1.2-%{version}-%{release}.cat \ - /usr/share/sgml/docbook/dsssl-stylesheets-$STYLESHEETS/catalog - - # DocBook V4.2 - /usr/bin/xmlcatalog --sgml --noout --del \ - /etc/sgml/sgml-docbook-4.2-%{version}-%{release}.cat \ - /usr/share/sgml/openjade-%{openjadever}/catalog - /usr/bin/xmlcatalog --sgml --noout --del \ - /etc/sgml/sgml-docbook-4.2-%{version}-%{release}.cat \ - /usr/share/sgml/docbook/dsssl-stylesheets-$STYLESHEETS/catalog - - # DocBook XML V4.2 - /usr/bin/xmlcatalog --sgml --noout --del \ - /etc/sgml/xml-docbook-4.2-%{version}-%{release}.cat \ - /usr/share/sgml/openjade-%{openjadever}/catalog - /usr/bin/xmlcatalog --sgml --noout --del \ - /etc/sgml/xml-docbook-4.2-%{version}-%{release}.cat \ - /usr/share/sgml/docbook/dsssl-stylesheets-$STYLESHEETS/catalog +# Fix up SGML super catalog so that there isn't an XML DTD before an +# SGML one. We need to do this (*sigh*) because xmlcatalog messes up +# the order of the lines, and SGML tools don't like to see XML things +# they aren't expecting. +CATALOG=/etc/sgml/catalog +SGML=$(cat -n ${CATALOG} | grep sgml-docbook | head -1 | (read n line;echo $n)) +XML=$(cat -n ${CATALOG} | grep xml-docbook | head -1 | (read n line; echo $n)) +# Do they need switching around? +if [ "${XML}" -lt "${SGML}" ] +then + # Switch those two lines around. + XML=$((XML - 1)) + SGML=$((SGML - 1)) + perl -e "@_=<>;@_[$XML, $SGML]=@_[$SGML, $XML];print @_" \ + ${CATALOG} > ${CATALOG}.rpmtmp + mv -f ${CATALOG}.rpmtmp ${CATALOG} fi ## @@ -811,7 +748,30 @@ then fi %changelog -* Wed Jan 22 2003 Tim Powers +* Wed Aug 6 2003 Tim Waugh 1.0-22.1 +- Rebuilt. + +* Wed Aug 6 2003 Tim Waugh 1.0-22 +- More work-arounds for buggy xmlcatalog. + +* Tue Jul 15 2003 Tim Waugh 1.0-21.1 +- Rebuilt. + +* Tue Jul 15 2003 Tim Waugh 1.0-21 +- Fix € in SGML tools. + +* Wed May 28 2003 Tim Waugh 1.0-20 +- Fix summary and description (bug #73005). + +* Fri Mar 28 2003 Tim Waugh 1.0-19 +- Use --parents in %%doc. +- Fix %%postun scriptlet. + +* Fri Mar 14 2003 Tim Waugh 1.0-18 +- Use Requires:, not Conflicts:, for openjade. +- Require openjade 1.3.2. + +* Wed Jan 22 2003 Tim Powers 1.0-17 - rebuilt * Fri Dec 20 2002 Tim Waugh 1.0-16