added Docbook DTD SGML and XML 4.5 + dist tag

.cvsignore

@@ -9,3 +9,5 @@ docbook-xml-4.3.zip
 docbook-4.3.zip
 docbook-4.4.zip
 docbook-xml-4.4.zip
+docbook-4.5.zip
+docbook-xml-4.5.zip

docbook-dtds.spec

@@ -1,6 +1,6 @@
 Name: docbook-dtds
 Version: 1.0
-Release: 31
+Release: 32%{?dist}
 Group: Applications/Text
 
 Summary: SGML and XML document type definitions for DocBook.
@@ -19,6 +19,7 @@ Provides: docbook-dtd412-xml
 Provides: docbook-dtd42-sgml docbook-dtd42-xml
 Provides: docbook-dtd43-sgml docbook-dtd43-xml
 Provides: docbook-dtd44-sgml docbook-dtd44-xml
+Provides: docbook-dtd45-sgml docbook-dtd45-xml
 
 PreReq: xml-common fileutils
 PreReq: textutils grep perl
@@ -46,6 +47,8 @@ Source7: http://www.docbook.org/sgml/4.3/docbook-4.3.zip
 Source8: http://www.docbook.org/xml/4.3/docbook-xml-4.3.zip
 Source9: http://www.docbook.org/sgml/4.4/docbook-4.4.zip
 Source10: http://www.docbook.org/xml/4.4/docbook-xml-4.4.zip
+Source11: http://www.docbook.org/sgml/4.5/docbook-4.5.zip
+Source12: http://www.docbook.org/xml/4.5/docbook-xml-4.5.zip
 Patch0: docbook-dtd30-sgml-1.0.catalog.patch
 Patch1: docbook-dtd31-sgml-1.0.catalog.patch
 Patch2: docbook-dtd40-sgml-1.0.catalog.patch
@@ -138,6 +141,18 @@ cd 4.4-xml
 unzip %{SOURCE10}
 cd ..
 
+# DocBook v4.5
+mkdir 4.5-sgml
+cd 4.5-sgml
+unzip %{SOURCE11}
+cd ..
+
+# DocBook XML v4.5
+mkdir 4.5-xml
+cd 4.5-xml
+unzip %{SOURCE12}
+cd ..
+
 # Fix € in SGML.
 %patch5 -p1
 
@@ -269,11 +284,32 @@ install *.mod $DESTDIR
 install ent/* $DESTDIR/ent
 cd ..
 
+# DocBook V4.5
+cd 4.5-sgml
+DESTDIR=$RPM_BUILD_ROOT/usr/share/sgml/docbook/sgml-dtd-4.5-%{version}-%{release}
+mkdir -p $DESTDIR
+install *.dcl $DESTDIR
+install docbook.cat $DESTDIR/catalog
+install *.dtd $DESTDIR
+install *.mod $DESTDIR
+cd ..
+
+# DocBook XML V4.5
+cd 4.5-xml
+DESTDIR=$RPM_BUILD_ROOT/usr/share/sgml/docbook/xml-dtd-4.5-%{version}-%{release}
+mkdir -p $DESTDIR/ent
+install docbook.cat $DESTDIR/catalog
+install *.dtd $DESTDIR
+install *.mod $DESTDIR
+install ent/* $DESTDIR/ent
+cd ..
+
+
 # Symlinks
 mkdir -p $RPM_BUILD_ROOT/etc/sgml
-ln -s sgml-docbook-4.4-%{version}-%{release}.cat \
+ln -s sgml-docbook-4.5-%{version}-%{release}.cat \
 	$RPM_BUILD_ROOT/etc/sgml/sgml-docbook.cat
-ln -s xml-docbook-4.4-%{version}-%{release}.cat \
+ln -s xml-docbook-4.5-%{version}-%{release}.cat \
 	$RPM_BUILD_ROOT/etc/sgml/xml-docbook.cat
 
 # Files for %ghost
@@ -284,10 +320,14 @@ touch $RPM_BUILD_ROOT/etc/sgml/sgml-docbook-4.1-%{version}-%{release}.cat
 touch $RPM_BUILD_ROOT/etc/sgml/sgml-docbook-4.2-%{version}-%{release}.cat
 touch $RPM_BUILD_ROOT/etc/sgml/sgml-docbook-4.3-%{version}-%{release}.cat
 touch $RPM_BUILD_ROOT/etc/sgml/sgml-docbook-4.4-%{version}-%{release}.cat
+touch $RPM_BUILD_ROOT/etc/sgml/sgml-docbook-4.5-%{version}-%{release}.cat
 touch $RPM_BUILD_ROOT/etc/sgml/xml-docbook-4.1.2-%{version}-%{release}.cat
 touch $RPM_BUILD_ROOT/etc/sgml/xml-docbook-4.2-%{version}-%{release}.cat
 touch $RPM_BUILD_ROOT/etc/sgml/xml-docbook-4.3-%{version}-%{release}.cat
 touch $RPM_BUILD_ROOT/etc/sgml/xml-docbook-4.4-%{version}-%{release}.cat
+touch $RPM_BUILD_ROOT/etc/sgml/xml-docbook-4.5-%{version}-%{release}.cat
+
+
 
 
 %clean
@@ -308,10 +348,12 @@ rm -rf $RPM_BUILD_ROOT
 /usr/share/sgml/docbook/sgml-dtd-4.2-%{version}-%{release}
 /usr/share/sgml/docbook/sgml-dtd-4.3-%{version}-%{release}
 /usr/share/sgml/docbook/sgml-dtd-4.4-%{version}-%{release}
+/usr/share/sgml/docbook/sgml-dtd-4.5-%{version}-%{release}
 /usr/share/sgml/docbook/xml-dtd-4.1.2-%{version}-%{release}
 /usr/share/sgml/docbook/xml-dtd-4.2-%{version}-%{release}
 /usr/share/sgml/docbook/xml-dtd-4.3-%{version}-%{release}
 /usr/share/sgml/docbook/xml-dtd-4.4-%{version}-%{release}
+/usr/share/sgml/docbook/xml-dtd-4.5-%{version}-%{release}
 %ghost /etc/sgml/sgml-docbook-3.0-%{version}-%{release}.cat
 %ghost /etc/sgml/sgml-docbook-3.1-%{version}-%{release}.cat
 %ghost /etc/sgml/sgml-docbook-4.0-%{version}-%{release}.cat
@@ -319,11 +361,12 @@ rm -rf $RPM_BUILD_ROOT
 %ghost /etc/sgml/sgml-docbook-4.2-%{version}-%{release}.cat
 %ghost /etc/sgml/sgml-docbook-4.3-%{version}-%{release}.cat
 %ghost /etc/sgml/sgml-docbook-4.4-%{version}-%{release}.cat
+%ghost /etc/sgml/sgml-docbook-4.5-%{version}-%{release}.cat
 %ghost /etc/sgml/xml-docbook-4.1.2-%{version}-%{release}.cat
 %ghost /etc/sgml/xml-docbook-4.2-%{version}-%{release}.cat
 %ghost /etc/sgml/xml-docbook-4.3-%{version}-%{release}.cat
 %ghost /etc/sgml/xml-docbook-4.4-%{version}-%{release}.cat
-
+%ghost /etc/sgml/xml-docbook-4.5-%{version}-%{release}.cat
 
 %post
 ## Clean up pre-docbook-dtds mess caused by broken trigger.
@@ -430,6 +473,23 @@ done
 	/etc/sgml/xml-docbook-4.4-%{version}-%{release}.cat \
 	/usr/share/sgml/docbook/xml-dtd-4.4-%{version}-%{release}/catalog
 
+# DocBook V4.5
+/usr/bin/xmlcatalog --sgml --noout --add \
+	/etc/sgml/sgml-docbook-4.5-%{version}-%{release}.cat \
+	/usr/share/sgml/sgml-iso-entities-8879.1986/catalog
+/usr/bin/xmlcatalog --sgml --noout --add \
+	/etc/sgml/sgml-docbook-4.5-%{version}-%{release}.cat \
+	/usr/share/sgml/docbook/sgml-dtd-4.5-%{version}-%{release}/catalog
+
+# DocBook XML V4.5
+/usr/bin/xmlcatalog --sgml --noout --add \
+	/etc/sgml/xml-docbook-4.5-%{version}-%{release}.cat \
+	/usr/share/sgml/sgml-iso-entities-8879.1986/catalog
+/usr/bin/xmlcatalog --sgml --noout --add \
+	/etc/sgml/xml-docbook-4.5-%{version}-%{release}.cat \
+	/usr/share/sgml/docbook/xml-dtd-4.5-%{version}-%{release}/catalog
+
+
 # The following lines are for the case in which the style sheets
 # were installed after another DTD but before this DTD
 STYLESHEETS=$(echo /usr/share/sgml/docbook/dsssl-stylesheets-*)
@@ -522,6 +582,23 @@ if [ "$STYLESHEETS" != "*" ]; then
     /usr/bin/xmlcatalog --sgml --noout --add \
 	/etc/sgml/xml-docbook-4.4-%{version}-%{release}.cat \
 	/usr/share/sgml/docbook/dsssl-stylesheets-$STYLESHEETS/catalog
+
+   # DocBook V4.5
+    /usr/bin/xmlcatalog --sgml --noout --add \
+	/etc/sgml/sgml-docbook-4.5-%{version}-%{release}.cat \
+	/usr/share/sgml/openjade-%{openjadever}/catalog
+    /usr/bin/xmlcatalog --sgml --noout --add \
+	/etc/sgml/sgml-docbook-4.5-%{version}-%{release}.cat \
+	/usr/share/sgml/docbook/dsssl-stylesheets-$STYLESHEETS/catalog
+
+    # DocBook XML V4.5
+    /usr/bin/xmlcatalog --sgml --noout --add \
+	/etc/sgml/xml-docbook-4.5-%{version}-%{release}.cat \
+	/usr/share/sgml/openjade-%{openjadever}/catalog
+    /usr/bin/xmlcatalog --sgml --noout --add \
+	/etc/sgml/xml-docbook-4.5-%{version}-%{release}.cat \
+	/usr/share/sgml/docbook/dsssl-stylesheets-$STYLESHEETS/catalog
+
 fi
 
 # Fix up SGML super catalog so that there isn't an XML DTD before an
@@ -905,6 +982,96 @@ then
 	/usr/bin/xmlcatalog --noout --add "rewriteURI" \
 		"http://www.oasis-open.org/docbook/xml/4.4" \
 		"xml-dtd-4.4-%{version}-%{release}" $CATALOG
+
+   # DocBook XML V4.5
+	/usr/bin/xmlcatalog --noout --add "public" \
+		"ISO 8879:1986//ENTITIES Publishing//EN" \
+		"xml-dtd-4.5-%{version}-%{release}/ent/iso-pub.ent" $CATALOG
+	/usr/bin/xmlcatalog --noout --add "public" \
+		"ISO 8879:1986//ENTITIES Greek Letters//EN" \
+		"xml-dtd-4.5-%{version}-%{release}/ent/iso-grk1.ent" $CATALOG
+	/usr/bin/xmlcatalog --noout --add "public" \
+		"-//OASIS//ELEMENTS DocBook XML Information Pool V4.5//EN" \
+		"xml-dtd-4.5-%{version}-%{release}/dbpoolx.mod" $CATALOG
+	/usr/bin/xmlcatalog --noout --add "public" \
+		"ISO 8879:1986//ENTITIES Box and Line Drawing//EN" \
+		"xml-dtd-4.5-%{version}-%{release}/ent/iso-box.ent" $CATALOG
+	/usr/bin/xmlcatalog --noout --add "public" \
+		"-//OASIS//DTD DocBook XML V4.4//EN" \
+		"xml-dtd-4.5-%{version}-%{release}/docbookx.dtd" $CATALOG
+	/usr/bin/xmlcatalog --noout --add "public" \
+		"ISO 8879:1986//ENTITIES Greek Symbols//EN" \
+		"xml-dtd-4.5-%{version}-%{release}/ent/iso-grk3.ent" $CATALOG
+	/usr/bin/xmlcatalog --noout --add "public" \
+		"ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" \
+		"xml-dtd-4.5-%{version}-%{release}/ent/iso-amsn.ent" $CATALOG
+	/usr/bin/xmlcatalog --noout --add "public" \
+		"ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" \
+		"xml-dtd-4.5-%{version}-%{release}/ent/iso-num.ent" $CATALOG
+	/usr/bin/xmlcatalog --noout --add "public" \
+		"-//OASIS//ENTITIES DocBook XML Character Entities V4.5//EN" \
+		"xml-dtd-4.5-%{version}-%{release}/dbcentx.mod" $CATALOG
+	/usr/bin/xmlcatalog --noout --add "public" \
+		"ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" \
+		"xml-dtd-4.5-%{version}-%{release}/ent/iso-grk4.ent" $CATALOG
+	/usr/bin/xmlcatalog --noout --add "public" \
+		"-//OASIS//ENTITIES DocBook XML Notations V4.5//EN" \
+		"xml-dtd-4.5-%{version}-%{release}/dbnotnx.mod" $CATALOG
+	/usr/bin/xmlcatalog --noout --add "public" \
+		"ISO 8879:1986//ENTITIES Diacritical Marks//EN" \
+		"xml-dtd-4.5-%{version}-%{release}/ent/iso-dia.ent" $CATALOG
+	/usr/bin/xmlcatalog --noout --add "public" \
+		"ISO 8879:1986//ENTITIES Monotoniko Greek//EN" \
+		"xml-dtd-4.5-%{version}-%{release}/ent/iso-grk2.ent" $CATALOG
+	/usr/bin/xmlcatalog --noout --add "public" \
+		"-//OASIS//ENTITIES DocBook XML Additional General Entities V4.5//EN" \
+		"xml-dtd-4.5-%{version}-%{release}/dbgenent.mod" $CATALOG
+	/usr/bin/xmlcatalog --noout --add "public" \
+		"-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.5//EN" \
+		"xml-dtd-4.5-%{version}-%{release}/dbhierx.mod" $CATALOG
+	/usr/bin/xmlcatalog --noout --add "public" \
+		"ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" \
+		"xml-dtd-4.5-%{version}-%{release}/ent/iso-amsa.ent" $CATALOG
+	/usr/bin/xmlcatalog --noout --add "public" \
+		"ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" \
+		"xml-dtd-4.5-%{version}-%{release}/ent/iso-amso.ent" $CATALOG
+	/usr/bin/xmlcatalog --noout --add "public" \
+		"ISO 8879:1986//ENTITIES Russian Cyrillic//EN" \
+		"xml-dtd-4.5-%{version}-%{release}/ent/iso-cyrl.ent" $CATALOG
+	/usr/bin/xmlcatalog --noout --add "public" \
+		"ISO 8879:1986//ENTITIES General Technical//EN" \
+		"xml-dtd-4.5-%{version}-%{release}/ent/iso-tech.ent" $CATALOG
+	/usr/bin/xmlcatalog --noout --add "public" \
+		"ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" \
+		"xml-dtd-4.5-%{version}-%{release}/ent/iso-amsc.ent" $CATALOG
+	/usr/bin/xmlcatalog --noout --add "public" \
+		"-//OASIS//DTD XML Exchange Table Model 19990315//EN" \
+		"xml-dtd-4.5-%{version}-%{release}/soextblx.dtd" $CATALOG
+	/usr/bin/xmlcatalog --noout --add "public" \
+		"-//OASIS//DTD DocBook XML CALS Table Model V4.5//EN" \
+		"xml-dtd-4.5-%{version}-%{release}/calstblx.dtd" $CATALOG
+	/usr/bin/xmlcatalog --noout --add "public" \
+		"ISO 8879:1986//ENTITIES Added Latin 1//EN" \
+		"xml-dtd-4.5-%{version}-%{release}/ent/iso-lat1.ent" $CATALOG
+	/usr/bin/xmlcatalog --noout --add "public" \
+		"ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" \
+		"xml-dtd-4.5-%{version}-%{release}/ent/iso-amsb.ent" $CATALOG
+	/usr/bin/xmlcatalog --noout --add "public" \
+		"ISO 8879:1986//ENTITIES Added Latin 2//EN" \
+		"xml-dtd-4.5-%{version}-%{release}/ent/iso-lat2.ent" $CATALOG
+	/usr/bin/xmlcatalog --noout --add "public" \
+		"ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" \
+		"xml-dtd-4.5-%{version}-%{release}/ent/iso-amsr.ent" $CATALOG
+	/usr/bin/xmlcatalog --noout --add "public" \
+		"ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" \
+		"xml-dtd-4.5-%{version}-%{release}/ent/iso-cyr2.ent" $CATALOG
+	/usr/bin/xmlcatalog --noout --add "rewriteSystem" \
+		"http://www.oasis-open.org/docbook/xml/4.5" \
+		"xml-dtd-4.5-%{version}-%{release}" $CATALOG
+	/usr/bin/xmlcatalog --noout --add "rewriteURI" \
+		"http://www.oasis-open.org/docbook/xml/4.5" \
+		"xml-dtd-4.5-%{version}-%{release}" $CATALOG
+
 fi
 
 # Finally, make sure everything in /etc/sgml is readable!
@@ -971,6 +1138,17 @@ rm -f /etc/sgml/sgml-docbook-4.4-%{version}-%{release}.cat
 	/etc/sgml/xml-docbook-4.4-%{version}-%{release}.cat
 rm -f /etc/sgml/xml-docbook-4.4-%{version}-%{release}.cat
 
+# DocBook V4.5
+/usr/bin/xmlcatalog --sgml --noout --del /etc/sgml/catalog \
+	/etc/sgml/sgml-docbook-4.5-%{version}-%{release}.cat
+rm -f /etc/sgml/sgml-docbook-4.5-%{version}-%{release}.cat
+
+# DocBook XML V4.5
+/usr/bin/xmlcatalog --sgml --noout --del /etc/sgml/catalog \
+	/etc/sgml/xml-docbook-4.5-%{version}-%{release}.cat
+rm -f /etc/sgml/xml-docbook-4.5-%{version}-%{release}.cat
+
+
 # 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
@@ -1228,9 +1406,71 @@ then
 		"xml-dtd-4.4-%{version}-%{release}/ent/iso-cyr2.ent" $CATALOG
 	/usr/bin/xmlcatalog --noout --del \
 		"xml-dtd-4.4-%{version}-%{release}" $CATALOG
+
+  # DocBook XML V4.5
+	/usr/bin/xmlcatalog --noout --del \
+		"xml-dtd-4.5-%{version}-%{release}/ent/iso-pub.ent" $CATALOG
+	/usr/bin/xmlcatalog --noout --del \
+		"xml-dtd-4.5-%{version}-%{release}/ent/iso-grk1.ent" $CATALOG
+	/usr/bin/xmlcatalog --noout --del \
+		"xml-dtd-4.5-%{version}-%{release}/dbpoolx.mod" $CATALOG
+	/usr/bin/xmlcatalog --noout --del \
+		"xml-dtd-4.5-%{version}-%{release}/ent/iso-box.ent" $CATALOG
+	/usr/bin/xmlcatalog --noout --del \
+		"xml-dtd-4.5-%{version}-%{release}/docbookx.dtd" $CATALOG
+	/usr/bin/xmlcatalog --noout --del \
+		"xml-dtd-4.5-%{version}-%{release}/ent/iso-grk3.ent" $CATALOG
+	/usr/bin/xmlcatalog --noout --del \
+		"xml-dtd-4.5-%{version}-%{release}/ent/iso-amsn.ent" $CATALOG
+	/usr/bin/xmlcatalog --noout --del \
+		"xml-dtd-4.5-%{version}-%{release}/ent/iso-num.ent" $CATALOG
+	/usr/bin/xmlcatalog --noout --del \
+		"xml-dtd-4.5-%{version}-%{release}/dbcentx.mod" $CATALOG
+	/usr/bin/xmlcatalog --noout --del \
+		"xml-dtd-4.5-%{version}-%{release}/ent/iso-grk4.ent" $CATALOG
+	/usr/bin/xmlcatalog --noout --del \
+		"xml-dtd-4.5-%{version}-%{release}/dbnotnx.mod" $CATALOG
+	/usr/bin/xmlcatalog --noout --del \
+		"xml-dtd-4.5-%{version}-%{release}/ent/iso-dia.ent" $CATALOG
+	/usr/bin/xmlcatalog --noout --del \
+		"xml-dtd-4.5-%{version}-%{release}/ent/iso-grk2.ent" $CATALOG
+	/usr/bin/xmlcatalog --noout --del \
+		"xml-dtd-4.5-%{version}-%{release}/dbgenent.mod" $CATALOG
+	/usr/bin/xmlcatalog --noout --del \
+		"xml-dtd-4.5-%{version}-%{release}/dbhierx.mod" $CATALOG
+	/usr/bin/xmlcatalog --noout --del \
+		"xml-dtd-4.5-%{version}-%{release}/ent/iso-amsa.ent" $CATALOG
+	/usr/bin/xmlcatalog --noout --del \
+		"xml-dtd-4.5-%{version}-%{release}/ent/iso-amso.ent" $CATALOG
+	/usr/bin/xmlcatalog --noout --del \
+		"xml-dtd-4.5-%{version}-%{release}/ent/iso-cyrl.ent" $CATALOG
+	/usr/bin/xmlcatalog --noout --del \
+		"xml-dtd-4.5-%{version}-%{release}/ent/iso-tech.ent" $CATALOG
+	/usr/bin/xmlcatalog --noout --del \
+		"xml-dtd-4.5-%{version}-%{release}/ent/iso-amsc.ent" $CATALOG
+	/usr/bin/xmlcatalog --noout --del \
+		"xml-dtd-4.5-%{version}-%{release}/soextblx.dtd" $CATALOG
+	/usr/bin/xmlcatalog --noout --del \
+		"xml-dtd-4.5-%{version}-%{release}/calstblx.dtd" $CATALOG
+	/usr/bin/xmlcatalog --noout --del \
+		"xml-dtd-4.5-%{version}-%{release}/ent/iso-lat1.ent" $CATALOG
+	/usr/bin/xmlcatalog --noout --del \
+		"xml-dtd-4.5-%{version}-%{release}/ent/iso-amsb.ent" $CATALOG
+	/usr/bin/xmlcatalog --noout --del \
+		"xml-dtd-4.5-%{version}-%{release}/ent/iso-lat2.ent" $CATALOG
+	/usr/bin/xmlcatalog --noout --del \
+		"xml-dtd-4.5-%{version}-%{release}/ent/iso-amsr.ent" $CATALOG
+	/usr/bin/xmlcatalog --noout --del \
+		"xml-dtd-4.5-%{version}-%{release}/ent/iso-cyr2.ent" $CATALOG
+	/usr/bin/xmlcatalog --noout --del \
+		"xml-dtd-4.5-%{version}-%{release}" $CATALOG
 fi
 
 %changelog
+* Mon Oct  1 2007 Ondrej Vasik <ovasik@redhat.com> - 1.0.32
+- DocBook 4.4 SGML and XML.(#312941)
+- added dist tag
+
 * Wed Jun 20 2007 Ondrej Vasik <ovasik@redhat.com> - 1.0.31
 - .cat files touched and ghosted to be owned by package
 - (bug #193475)

sources

@@ -9,3 +9,5 @@ ab200202b9e136a144db1e0864c45074  docbook-xml-4.3.zip
 e3beb1b0b2923c24fa55a68e88654b01  docbook-4.3.zip
 f89e1bd0b2c7a361e3f1f739e16b5d0d  docbook-4.4.zip
 cbb04e9a700955d88c50962ef22c1634  docbook-xml-4.4.zip
+07c581f4bbcba6d3aac85360a19f95f7  docbook-4.5.zip
+03083e288e87a7e829e437358da7ef9e  docbook-xml-4.5.zip