rpms/moreutils/EL-5 import.log,1.1,1.2 moreutils.spec,1.8,1.9

[Marc Bradshaw]

Author: deebs

Update of /cvs/pkgs/rpms/moreutils/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7130/EL-5

Modified Files:
	import.log moreutils.spec 
Log Message:
attempt to fix epel build issues



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/moreutils/EL-5/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	27 Aug 2008 04:14:56 -0000	1.1
+++ import.log	16 Oct 2008 05:52:53 -0000	1.2
@@ -1 +1,2 @@
 moreutils-0_31-1_fc9:EL-5:moreutils-0.31-1.fc9.src.rpm:1219810455
+moreutils-0_31-3_fc9:EL-5:moreutils-0.31-3.fc9.src.rpm:1224136317


Index: moreutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moreutils/EL-5/moreutils.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- moreutils.spec	27 Aug 2008 04:14:56 -0000	1.8
+++ moreutils.spec	16 Oct 2008 05:52:53 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           moreutils
 Version:        0.31
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        Additional unix utilities
 Group:          Applications/System
 License:        GPLv2
@@ -33,7 +33,7 @@
 %prep
 %setup -qn %{name}
 # the required dtd's are not where this package expects them to be, let's fix that
-DTDFILE=`xmlcatalog /usr/share/sgml/docbook/xmlcatalog "-//OASIS//DTD DocBook XML V4.4//EN"`
+DTDFILE=`xmlcatalog /usr/share/sgml/docbook/xmlcatalog "-//OASIS//DTD DocBook XML V4.4//EN" "-//OASIS//DTD DocBook XML V4.3//EN"|grep -v "No entry"|head -n1`
 sed -r -i "s|/usr/share/xml/docbook/schema/dtd/4.4/docbookx.dtd|$DTDFILE|" *.docbook
 # the docbook2x-man command is different in fedora, let's fix that too
 sed -r -i "s|docbook2x-man|db2x_docbook2man|" Makefile
@@ -86,6 +86,12 @@
 
 
 %changelog
+* Thu Oct 16 2008 Marc Bradshaw <fedora at marcbradshaw.co.uk> 0.31-3%{?dist}
+- Fix for EPEL docbook dtd version
+
+* Sat Oct 11 2008 Marc Bradshaw <fedora at marcbradshaw.co.uk> 0.31-2%{?dist}
+- Fix for EPEL docbook dtd version
+
 * Thu Aug 21 2008 Marc Bradshaw <fedora at marcbradshaw.co.uk> 0.31-1%{?dist}
 - new upstream version 0.31 released with these changes
 - * pee.1: Document difference with tee in stdout.