From b513c371c8be60eecd5815d138dbf5d9e68c34b8 Mon Sep 17 00:00:00 2001
From: cvsdist <cvsdist@fedoraproject.org>
Date: Thu, 9 Sep 2004 12:19:42 +0000
Subject: [PATCH] auto-import changelog data from sgml-common-0.6.3-14.src.rpm
 Wed Jan 22 2003 Tim Powers <timp@redhat.com> - rebuilt Wed Oct 23 2002 Tim
 Waugh <twaugh@redhat.com> 0.6.3-13 - Ship the installed documentation. -
 Don't install files not packaged.

---
 sgml-common-0.6.3-docdir.patch | 11 +++++++++++
 sgml-common.spec               | 18 ++++++++++++++----
 2 files changed, 25 insertions(+), 4 deletions(-)
 create mode 100644 sgml-common-0.6.3-docdir.patch

diff --git a/sgml-common-0.6.3-docdir.patch b/sgml-common-0.6.3-docdir.patch
new file mode 100644
index 0000000..fc960ad
--- /dev/null
+++ b/sgml-common-0.6.3-docdir.patch
@@ -0,0 +1,11 @@
+--- sgml-common-0.6.3/configure.in.docdir	2002-10-23 12:07:31.000000000 +0100
++++ sgml-common-0.6.3/configure.in	2002-10-23 12:08:10.000000000 +0100
+@@ -4,6 +4,8 @@
+ AM_INIT_AUTOMAKE(sgml-common, 0.6.3)
+ 
+ docdir='$(prefix)/doc'
++AC_ARG_WITH(docdir, [  -with-docdir=DOCDIR    documentation directory],
++  docdir=$withval)
+ AC_SUBST(docdir)
+ 
+ dnl Checks for programs.
diff --git a/sgml-common.spec b/sgml-common.spec
index 34117e3..ac26c75 100644
--- a/sgml-common.spec
+++ b/sgml-common.spec
@@ -1,6 +1,6 @@
 Name: sgml-common
 Version: 0.6.3
-Release: 12
+Release: 14
 Group: Applications/Text
 
 Summary: Common SGML catalog and DTD files.
@@ -22,6 +22,7 @@ Patch0: sgml-common-umask.patch
 Patch1: sgml-common-xmldir.patch
 Patch2: sgml-common-quotes.patch
 Patch3: sgml-common-automake.patch
+Patch4: sgml-common-0.6.3-docdir.patch
 
 Requires: sh-utils fileutils textutils grep
 BuildRequires: libxml2 >= 2.4.8-2
@@ -53,18 +54,19 @@ included in multiple packages.
 rm install-sh missing mkinstalldirs
 tar zxf %{SOURCE2}
 %patch3 -p1 -b .automake
+%patch4 -p1 -b .docdir
 aclocal
 automake --add-missing --copy
 
 
 %build
-%configure
+%configure --with-docdir=%{_docdir}
 
 
 %install
 DESTDIR=$RPM_BUILD_ROOT
 rm -rf $DESTDIR
-%makeinstall
+%makeinstall docdir=%{buildroot}%{_docdir}
 cp %{SOURCE1} CHANGES
 mkdir $RPM_BUILD_ROOT/etc/xml
 mkdir $RPM_BUILD_ROOT/usr/share/sgml/docbook
@@ -94,6 +96,7 @@ XMLCATALOG=$RPM_BUILD_ROOT/etc/xml/catalog
 rm -f %{buildroot}/usr/share/sgml/xml.dcl
 install -m0644 %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} \
 	%{buildroot}/usr/share/sgml
+rm -rf %{buildroot}/usr/share/xml
 
 
 %clean
@@ -103,7 +106,6 @@ rm -rf $DESTDIR
 
 %files
 %defattr (-,root,root)
-%doc CHANGES doc/HTML/*.html
 %dir /etc/sgml
 %config(noreplace) /etc/sgml/sgml.conf
 %dir /usr/share/sgml/sgml-iso-entities-8879.1986
@@ -115,6 +117,7 @@ rm -rf $DESTDIR
 /usr/bin/sgmlwhich
 /usr/bin/install-catalog
 %{_mandir}/*/*
+%{_docdir}/*
 
 %files -n xml-common
 %defattr (-,root,root)
@@ -124,6 +127,13 @@ rm -rf $DESTDIR
 %config(noreplace) /usr/share/sgml/docbook/xmlcatalog
 
 %changelog
+* Wed Jan 22 2003 Tim Powers <timp@redhat.com>
+- rebuilt
+
+* Wed Oct 23 2002 Tim Waugh <twaugh@redhat.com> 0.6.3-13
+- Ship the installed documentation.
+- Don't install files not packaged.
+
 * Fri Jun 21 2002 Tim Powers <timp@redhat.com>
 - automated rebuild