From d806d3a90d467647bd6a7d0d61194089ba2fe10c Mon Sep 17 00:00:00 2001
From: Ondrej Vasik <ovasik@fedoraproject.org>
Date: Thu, 22 Nov 2007 12:28:32 +0000
Subject: [PATCH] Another Merge Review(#226415) improvements

---
 sgml-common.spec | 48 ++++++++++++++++++++++++++++++------------------
 1 file changed, 30 insertions(+), 18 deletions(-)

diff --git a/sgml-common.spec b/sgml-common.spec
index f537b91..17b9c84 100644
--- a/sgml-common.spec
+++ b/sgml-common.spec
@@ -1,6 +1,6 @@
 Name: sgml-common
 Version: 0.6.3
-Release: 22%{?dist}
+Release: 23%{?dist}
 Group: Applications/Text
 
 Summary: Common SGML catalog and DTD files
@@ -29,7 +29,7 @@ Patch3: sgml-common-automake.patch
 Patch4: sgml-common-0.6.3-docdir.patch
 
 BuildRequires: libxml2 >= 2.4.8-2
-BuildRequires: automake autoconf
+BuildRequires: automake
 
 %description
 The sgml-common package contains a collection of entities and DTDs
@@ -44,33 +44,33 @@ License: GPL+
 URL: http://www.w3.org/2003/entities/
 
 %description -n xml-common
-The xml-common package contains a collection of entities and DTDs
-that are useful for processing XML, but that don't need to be
-included in multiple packages.
-
+The xml-common is a subpackage of sgml-common which contains 
+a collection XML catalogs that are useful for processing XML, 
+but that don't need to be included in main package.
 
 %prep
 %setup -q
 %patch0 -p1 -b .umask
 %patch1 -p1 -b .xmldir
-%patch2 -p1 -b .quotes
-%patch3 -p1 -b .automake
-#patch4 not applied but still shipped with SRPM(see #226415 MergeReview)
+#patch 3 and patch4 not applied but still shipped with SRPM
+#(see #226415 MergeReview)
+#%patch3 -p1 -b .automake
 #%patch4 -p1 -b .docdir
-aclocal
-autoconf
-automake --add-missing
+
+# replace bogus links with files
+for file in COPYING INSTALL install-sh missing mkinstalldirs; do 
+   rm $file
+   cp -p /usr/share/automake-1.4/$file .
+done
 
 %build
 %configure
 
 %install
 rm -rf $RPM_BUILD_ROOT
-export DESTDIR="$RPM_BUILD_ROOT"
-make install docdir=$RPM_BUILDROOT%{_docdir} prefix=$RPM_BUILDROOT%{_prefix} \
-mandir=$RPMBUILDROOT%{_mandir}
+make install DESTDIR="$RPM_BUILD_ROOT" htmldir='%{_datadir}/doc' INSTALL='install -p'
 mkdir $RPM_BUILD_ROOT%{_sysconfdir}/xml
-mkdir $RPM_BUILD_ROOT%{_datadir}/sgml/docbook
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/sgml/docbook
 # Create an empty XML catalog.
 XMLCATALOG=$RPM_BUILD_ROOT%{_sysconfdir}/xml/catalog
 %{_bindir}/xmlcatalog --noout --create $XMLCATALOG
@@ -99,12 +99,19 @@ install -p -m0644 %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} \
 	$RPM_BUILD_ROOT%{_datadir}/sgml
 rm -rf $RPM_BUILD_ROOT%{_datadir}/xml/*
 
+# remove installed doc file and prepare installation with %%doc
+rm $RPM_BUILD_ROOT%{_datadir}/doc/*.html
+rm -rf __dist_doc/html/
+mkdir -p __dist_doc/html/
+cp -p doc/HTML/*.html __dist_doc/html/
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr (-,root,root, -)
+%doc __dist_doc/html/ AUTHORS NEWS ChangeLog README
 %dir %{_sysconfdir}/sgml
 %config(noreplace) %{_sysconfdir}/sgml/sgml.conf
 %dir %{_datadir}/sgml
@@ -116,8 +123,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/sgml/html.soc
 %{_bindir}/sgmlwhich
 %{_bindir}/install-catalog
-%{_mandir}/*/*
-%{_docdir}/*
+%{_mandir}/man8/install-catalog.8*
 
 %files -n xml-common
 %defattr (-,root,root,-)
@@ -129,6 +135,12 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_datadir}/xml
 
 %changelog
+* Thu Nov 22 2007 Ondrej Vasik <ovasik@redhat.com> 0.6.3-23
+- Another MergeReview improvements(provided by Patrice Dumas)
+- copy Automake-1.4 files instead of rerunning autotools,
+- better preserving timestamps, better handling of documentation
+- improved XML-common description
+
 * Thu Nov 15 2007 Ondrej Vasik <ovasik@redhat.com> 0.6.3-22
 - Merge Review(226415)
 - changed: License Tag, using RPM macros instead of hardcoded