diff --git a/html.dcl b/html.dcl
new file mode 100644
index 0000000..710e9e2
--- /dev/null
+++ b/html.dcl
@@ -0,0 +1,88 @@
+
+
diff --git a/html.soc b/html.soc
new file mode 100644
index 0000000..c0b1949
--- /dev/null
+++ b/html.soc
@@ -0,0 +1,31 @@
+ -- catalog: SGML Open style entity catalog for HTML --
+ -- $Id: html.soc,v 1.1 2004/09/09 12:19:26 cvsdist Exp $ --
+ -- Hacked by jjc --
+
+ -- Ways to refer to Level 2: most general to most specific --
+PUBLIC "-//IETF//DTD HTML//EN" html.dtd
+PUBLIC "-//IETF//DTD HTML 2.0//EN" html.dtd
+PUBLIC "-//IETF//DTD HTML Level 2//EN" html.dtd
+PUBLIC "-//IETF//DTD HTML 2.0 Level 2//EN" html.dtd
+
+ -- Ways to refer to Level 1: most general to most specific --
+PUBLIC "-//IETF//DTD HTML Level 1//EN" html-1.dtd
+PUBLIC "-//IETF//DTD HTML 2.0 Level 1//EN" html-1.dtd
+
+ -- Ways to refer to
+ Strict Level 2: most general to most specific --
+PUBLIC "-//IETF//DTD HTML Strict//EN" html-s.dtd
+PUBLIC "-//IETF//DTD HTML 2.0 Strict//EN" html-s.dtd
+PUBLIC "-//IETF//DTD HTML Strict Level 2//EN" html-s.dtd
+PUBLIC "-//IETF//DTD HTML 2.0 Strict Level 2//EN" html-s.dtd
+
+ -- Ways to refer to
+ Strict Level 1: most general to most specific --
+PUBLIC "-//IETF//DTD HTML Strict Level 1//EN" html-1s.dtd
+PUBLIC "-//IETF//DTD HTML 2.0 Strict Level 1//EN" html-1s.dtd
+
+ -- ISO latin 1 entity set for HTML --
+PUBLIC "ISO 8879-1986//ENTITIES Added Latin 1//EN//HTML" ISOlat1.sgm
+
+SGMLDECL html.dcl
+DOCTYPE html html.dtd
diff --git a/sgml-common-automake.patch b/sgml-common-automake.patch
new file mode 100644
index 0000000..034af8d
--- /dev/null
+++ b/sgml-common-automake.patch
@@ -0,0 +1,6 @@
+--- sgml-common-0.6.3/doc/man/Makefile.am.automake Wed Apr 24 11:58:17 2002
++++ sgml-common-0.6.3/doc/man/Makefile.am Wed Apr 24 11:59:02 2002
+@@ -1,2 +1,2 @@
+ man8dir = $(mandir)/man8
+-man8_DATA = *.8
++man8_MANS = install-catalog.8
diff --git a/sgml-common.spec b/sgml-common.spec
index 56f3748..5344064 100644
--- a/sgml-common.spec
+++ b/sgml-common.spec
@@ -1,6 +1,6 @@
Name: sgml-common
Version: 0.6.3
-Release: 9
+Release: 11
Group: Applications/Text
Summary: Common SGML catalog and DTD files.
@@ -13,9 +13,15 @@ BuildRoot: %{_tmppath}/%{name}-%{version}
Source0: ftp://sources.redhat.com/pub/docbook-tools/new-trials/SOURCES/%{name}-%{version}.tgz
Source1: sgml-common-CHANGES
Source2: sgml-common-automake.tar.gz
+# From openjade:
+Source3: xml.dcl
+Source4: xml.soc
+Source5: html.dcl
+Source6: html.soc
Patch0: sgml-common-umask.patch
Patch1: sgml-common-xmldir.patch
Patch2: sgml-common-quotes.patch
+Patch3: sgml-common-automake.patch
Requires: sh-utils fileutils textutils grep
BuildRequires: libxml2 >= 2.4.8-2
@@ -46,6 +52,9 @@ included in multiple packages.
%patch2 -p1 -b .quotes
rm install-sh missing mkinstalldirs
tar zxf %{SOURCE2}
+%patch3 -p1 -b .automake
+aclocal
+automake --add-missing --copy
%build
@@ -82,6 +91,10 @@ XMLCATALOG=$RPM_BUILD_ROOT/etc/xml/catalog
/usr/bin/xmlcatalog --noout --create \
$RPM_BUILD_ROOT/usr/share/sgml/docbook/xmlcatalog
+rm -f %{buildroot}/usr/share/sgml/xml.dcl
+install -m0644 %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} \
+ %{buildroot}/usr/share/sgml
+
%clean
DESTDIR=$RPM_BUILD_ROOT
@@ -96,6 +109,9 @@ rm -rf $DESTDIR
%dir /usr/share/sgml/sgml-iso-entities-8879.1986
/usr/share/sgml/sgml-iso-entities-8879.1986/*
/usr/share/sgml/xml.dcl
+/usr/share/sgml/xml.soc
+/usr/share/sgml/html.dcl
+/usr/share/sgml/html.soc
/usr/bin/sgmlwhich
/usr/bin/install-catalog
%{_mandir}/*/*
@@ -108,6 +124,13 @@ rm -rf $DESTDIR
%config(noreplace) /usr/share/sgml/docbook/xmlcatalog
%changelog
+* Thu May 23 2002 Tim Powers
+- automated rebuild
+
+* Wed Apr 24 2002 Tim Waugh 0.6.3-10
+- Ship {xml,html}.{dcl,soc} (bug #63500, bug #62980).
+- Work around broken tarball packaging.
+
* Thu Feb 21 2002 Tim Waugh 0.6.3-9
- Rebuild in new environment.
diff --git a/xml.dcl b/xml.dcl
new file mode 100644
index 0000000..fed2103
--- /dev/null
+++ b/xml.dcl
@@ -0,0 +1,179 @@
+"
+ PIC "?>"
+ SHORTREF NONE
+
+ NAMES
+ SGMLREF
+
+ QUANTITY NONE
+
+ ENTITIES
+ "amp" 38
+ "lt" 60
+ "gt" 62
+ "quot" 34
+ "apos" 39
+
+ FEATURES
+ MINIMIZE
+ DATATAG NO
+ OMITTAG NO
+ RANK NO
+ SHORTTAG
+ STARTTAG
+ EMPTY NO
+ UNCLOSED NO
+ NETENABL IMMEDNET
+ ENDTAG
+ EMPTY NO
+ UNCLOSED NO
+ ATTRIB
+ DEFAULT YES
+ OMITNAME NO
+ VALUE NO
+ EMPTYNRM YES
+ IMPLYDEF
+ ATTLIST NO
+ DOCTYPE NO
+ ELEMENT NO
+ ENTITY NO
+ NOTATION NO
+ LINK
+ SIMPLE NO
+ IMPLICIT NO
+ EXPLICIT NO
+ OTHER
+ CONCUR NO
+ SUBDOC NO
+ FORMAL NO
+ URN NO
+ KEEPRSRE YES
+ VALIDITY TYPE
+ ENTITIES
+ REF ANY
+ INTEGRAL YES
+ APPINFO NONE
+ SEEALSO "ISO 8879:1986//NOTATION
+ Extensible Markup Language (XML) 1.0//EN"
+>
diff --git a/xml.soc b/xml.soc
new file mode 100644
index 0000000..278c6f3
--- /dev/null
+++ b/xml.soc
@@ -0,0 +1 @@
+SGMLDECL "xml.dcl"