auto-import changelog data from docbook-dtds-1.0-22.1.src.rpm

Wed Aug 06 2003 Tim Waugh <twaugh@redhat.com> 1.0-22.1
- Rebuilt.
Wed Aug 06 2003 Tim Waugh <twaugh@redhat.com> 1.0-22
- More work-arounds for buggy xmlcatalog.
Tue Jul 15 2003 Tim Waugh <twaugh@redhat.com> 1.0-21.1
- Rebuilt.
Tue Jul 15 2003 Tim Waugh <twaugh@redhat.com> 1.0-21
- Fix &euro; in SGML tools.
Wed May 28 2003 Tim Waugh <twaugh@redhat.com> 1.0-20
- Fix summary and description (bug #73005).
Fri Mar 28 2003 Tim Waugh <twaugh@redhat.com> 1.0-19
- Use --parents in %doc.
- Fix %postun scriptlet.
Fri Mar 14 2003 Tim Waugh <twaugh@redhat.com> 1.0-18
- Use Requires:, not Conflicts:, for openjade.
- Require openjade 1.3.2.
This commit is contained in:
cvsdist 2004-09-09 04:19:59 +00:00
parent d98fcc91eb
commit d308bfd381
2 changed files with 95 additions and 113 deletions

22
docbook-4.2-euro.patch Normal file
View File

@ -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 @@
<![%dbcent.module;[
<![%sgml.features;[
-<!ENTITY euro "[euro ]"><!-- euro sign, U+20AC NEW -->
+<!ENTITY euro SDATA "[euro ]"><!-- euro sign, U+20AC NEW -->
]]>
<![%xml.features;[
<!ENTITY euro "&#x20AC;"><!-- euro sign, U+20AC NEW -->
--- 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 @@
<![%dbcent.module;[
<![%sgml.features;[
-<!ENTITY euro "[euro ]"><!-- euro sign, U+20AC NEW -->
+<!ENTITY euro SDATA "[euro ]"><!-- euro sign, U+20AC NEW -->
]]>
<![%xml.features;[
<!ENTITY euro "&#x20AC;"><!-- euro sign, U+20AC NEW -->

View File

@ -1,9 +1,9 @@
Name: docbook-dtds Name: docbook-dtds
Version: 1.0 Version: 1.0
Release: 17 Release: 22.1
Group: Applications/Text Group: Applications/Text
Summary: XML document type definition for DocBook 4.1.2 Summary: SGML and XML document type definitions for DocBook.
License: Distributable License: Distributable
URL: http://www.oasis-open.org/docbook/ 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 Patch2: docbook-dtd40-sgml-1.0.catalog.patch
Patch3: docbook-dtd41-sgml-1.0.catalog.patch Patch3: docbook-dtd41-sgml-1.0.catalog.patch
Patch4: docbook-dtd42-sgml-1.0.catalog.patch Patch4: docbook-dtd42-sgml-1.0.catalog.patch
Patch5: docbook-4.2-euro.patch
BuildRequires: unzip BuildRequires: unzip
%define openjadever 1.3.1 %define openjadever 1.3.2
Conflicts: openjade < %{openjadever} Requires: openjade = %{openjadever}
Conflicts: openjade > %{openjadever}
%description %description
The DocBook Document Type Definition (DTD) describes the syntax of The DocBook Document Type Definition (DTD) describes the syntax of
technical documentation texts (articles, books and manual pages). technical documentation texts (articles, books and manual pages).
This syntax is XML-compliant and is developed by the OASIS consortium. 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 This package contains SGML and XML versions of the DocBook DTD.
and including version 4.1.2.
%prep %prep
@ -108,6 +107,9 @@ cd 4.2-xml
unzip %{SOURCE6} unzip %{SOURCE6}
cd .. cd ..
# Fix &euro; in SGML.
%patch5 -p1
if [ `id -u` -eq 0 ]; then if [ `id -u` -eq 0 ]; then
chown -R root.root . chown -R root.root .
chmod -R a+rX,g-w,o-w . chmod -R a+rX,g-w,o-w .
@ -204,9 +206,9 @@ rm -rf $RPM_BUILD_ROOT
%files %files
%defattr (-,root,root) %defattr (-,root,root)
%doc 3.1-sgml/ChangeLog %doc --parents 3.1-sgml/ChangeLog
%doc 4.1-sgml/ChangeLog %doc --parents 4.1-sgml/ChangeLog
%doc */*.txt %doc --parents */*.txt
/usr/share/sgml/docbook/sgml-dtd-3.0-%{version}-%{release} /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-3.1-%{version}-%{release}
/usr/share/sgml/docbook/sgml-dtd-4.0-%{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 # Update the centralized catalog corresponding to this version of the DTD
# DocBook V3.0 # DocBook V3.0
/usr/bin/xmlcatalog --sgml --noout --del \ /usr/bin/xmlcatalog --sgml --noout --del /etc/sgml/catalog \
/etc/sgml/sgml-docbook-3.0-%{version}-%{release}.cat \ /etc/sgml/sgml-docbook-3.0-%{version}-%{release}.cat
/usr/share/sgml/sgml-iso-entities-8879.1986/catalog rm -f /etc/sgml/sgml-docbook-3.0-%{version}-%{release}.cat
/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
# DocBook V3.1 # DocBook V3.1
/usr/bin/xmlcatalog --sgml --noout --del \ /usr/bin/xmlcatalog --sgml --noout --del /etc/sgml/catalog \
/etc/sgml/sgml-docbook-3.1-%{version}-%{release}.cat \ /etc/sgml/sgml-docbook-3.1-%{version}-%{release}.cat
/usr/share/sgml/sgml-iso-entities-8879.1986/catalog rm -f /etc/sgml/sgml-docbook-3.1-%{version}-%{release}.cat
/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
# DocBook V4.0 # DocBook V4.0
/usr/bin/xmlcatalog --sgml --noout --del \ /usr/bin/xmlcatalog --sgml --noout --del /etc/sgml/catalog \
/etc/sgml/sgml-docbook-4.0-%{version}-%{release}.cat \ /etc/sgml/sgml-docbook-4.0-%{version}-%{release}.cat
/usr/share/sgml/sgml-iso-entities-8879.1986/catalog rm -f /etc/sgml/sgml-docbook-4.0-%{version}-%{release}.cat
/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
# DocBook V4.1 # DocBook V4.1
/usr/bin/xmlcatalog --sgml --noout --del \ /usr/bin/xmlcatalog --sgml --noout --del /etc/sgml/catalog \
/etc/sgml/sgml-docbook-4.1-%{version}-%{release}.cat \ /etc/sgml/sgml-docbook-4.1-%{version}-%{release}.cat
/usr/share/sgml/sgml-iso-entities-8879.1986/catalog rm -f /etc/sgml/sgml-docbook-4.1-%{version}-%{release}.cat
/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
# DocBook XML V4.1.2 # DocBook XML V4.1.2
/usr/bin/xmlcatalog --sgml --noout --del \ /usr/bin/xmlcatalog --sgml --noout --del /etc/sgml/catalog \
/etc/sgml/xml-docbook-4.1.2-%{version}-%{release}.cat \ /etc/sgml/xml-docbook-4.1.2-%{version}-%{release}.cat
/usr/share/sgml/sgml-iso-entities-8879.1986/catalog rm -f /etc/sgml/xml-docbook-4.1.2-%{version}-%{release}.cat
/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
# DocBook V4.2 # DocBook V4.2
/usr/bin/xmlcatalog --sgml --noout --del \ /usr/bin/xmlcatalog --sgml --noout --del /etc/sgml/catalog \
/etc/sgml/sgml-docbook-4.2-%{version}-%{release}.cat \ /etc/sgml/sgml-docbook-4.2-%{version}-%{release}.cat
/usr/share/sgml/sgml-iso-entities-8879.1986/catalog rm -f /etc/sgml/sgml-docbook-4.2-%{version}-%{release}.cat
/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
# DocBook XML V4.2 # DocBook XML V4.2
/usr/bin/xmlcatalog --sgml --noout --del \ /usr/bin/xmlcatalog --sgml --noout --del /etc/sgml/catalog \
/etc/sgml/xml-docbook-4.2-%{version}-%{release}.cat \ /etc/sgml/xml-docbook-4.2-%{version}-%{release}.cat
/usr/share/sgml/sgml-iso-entities-8879.1986/catalog rm -f /etc/sgml/xml-docbook-4.2-%{version}-%{release}.cat
/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
# The following lines are for the case in which the style sheets # Fix up SGML super catalog so that there isn't an XML DTD before an
# were not uninstalled because there is still another DTD # SGML one. We need to do this (*sigh*) because xmlcatalog messes up
STYLESHEETS=$(echo /usr/share/sgml/docbook/dsssl-stylesheets-*) # the order of the lines, and SGML tools don't like to see XML things
STYLESHEETS=${STYLESHEETS##*/dsssl-stylesheets-} # they aren't expecting.
if [ "$STYLESHEETS" != "*" ]; then CATALOG=/etc/sgml/catalog
# DocBook V3.0 SGML=$(cat -n ${CATALOG} | grep sgml-docbook | head -1 | (read n line;echo $n))
/usr/bin/xmlcatalog --sgml --noout --del \ XML=$(cat -n ${CATALOG} | grep xml-docbook | head -1 | (read n line; echo $n))
/etc/sgml/sgml-docbook-3.0-%{version}-%{release}.cat \ # Do they need switching around?
/usr/share/sgml/openjade-%{openjadever}/catalog if [ "${XML}" -lt "${SGML}" ]
/usr/bin/xmlcatalog --sgml --noout --del \ then
/etc/sgml/sgml-docbook-3.0-%{version}-%{release}.cat \ # Switch those two lines around.
/usr/share/sgml/docbook/dsssl-stylesheets-$STYLESHEETS/catalog XML=$((XML - 1))
SGML=$((SGML - 1))
# DocBook V3.1 perl -e "@_=<>;@_[$XML, $SGML]=@_[$SGML, $XML];print @_" \
/usr/bin/xmlcatalog --sgml --noout --del \ ${CATALOG} > ${CATALOG}.rpmtmp
/etc/sgml/sgml-docbook-3.1-%{version}-%{release}.cat \ mv -f ${CATALOG}.rpmtmp ${CATALOG}
/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
fi fi
## ##
@ -811,7 +748,30 @@ then
fi fi
%changelog %changelog
* Wed Jan 22 2003 Tim Powers <timp@redhat.com> * Wed Aug 6 2003 Tim Waugh <twaugh@redhat.com> 1.0-22.1
- Rebuilt.
* Wed Aug 6 2003 Tim Waugh <twaugh@redhat.com> 1.0-22
- More work-arounds for buggy xmlcatalog.
* Tue Jul 15 2003 Tim Waugh <twaugh@redhat.com> 1.0-21.1
- Rebuilt.
* Tue Jul 15 2003 Tim Waugh <twaugh@redhat.com> 1.0-21
- Fix &euro; in SGML tools.
* Wed May 28 2003 Tim Waugh <twaugh@redhat.com> 1.0-20
- Fix summary and description (bug #73005).
* Fri Mar 28 2003 Tim Waugh <twaugh@redhat.com> 1.0-19
- Use --parents in %%doc.
- Fix %%postun scriptlet.
* Fri Mar 14 2003 Tim Waugh <twaugh@redhat.com> 1.0-18
- Use Requires:, not Conflicts:, for openjade.
- Require openjade 1.3.2.
* Wed Jan 22 2003 Tim Powers <timp@redhat.com> 1.0-17
- rebuilt - rebuilt
* Fri Dec 20 2002 Tim Waugh <twaugh@redhat.com> 1.0-16 * Fri Dec 20 2002 Tim Waugh <twaugh@redhat.com> 1.0-16