rpms/moreutils/EL-4 import.log,1.2,1.3 moreutils.spec,1.9,1.10

[Marc Bradshaw]

Author: deebs

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

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



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/moreutils/EL-4/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	11 Oct 2008 11:41:03 -0000	1.2
+++ import.log	16 Oct 2008 05:41:35 -0000	1.3
@@ -1,2 +1,3 @@
 moreutils-0_31-1_fc9:EL-4:moreutils-0.31-1.fc9.src.rpm:1219810323
 moreutils-0_31-2_fc9:EL-4:moreutils-0.31-2.fc9.src.rpm:1223725214
+moreutils-0_31-3_fc9:EL-4:moreutils-0.31-3.fc9.src.rpm:1224135632


Index: moreutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moreutils/EL-4/moreutils.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- moreutils.spec	11 Oct 2008 11:41:03 -0000	1.9
+++ moreutils.spec	16 Oct 2008 05:41:35 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           moreutils
 Version:        0.31
-Release:        2%{?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";if [ $? == "4" ];then xmlcatalog /usr/share/sgml/docbook/xmlcatalog "-//OASIS//DTD DocBook XML V4.3//EN";fi;)|grep -v "No entry"`
+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,9 @@
 
 
 %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