From d6fcb22fc69e6da47a9fb08e13617aeef3509442 Mon Sep 17 00:00:00 2001
From: deebs <deebs@fedoraproject.org>
Date: Oct 16 2008 05:41:35 +0000
Subject: attempt to fix epel build issues


---

diff --git a/import.log b/import.log
index b15346c..252d4bc 100644
--- a/import.log
+++ b/import.log
@@ -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
diff --git a/moreutils.spec b/moreutils.spec
index 80f1887..ce8b1c1 100644
--- a/moreutils.spec
+++ b/moreutils.spec
@@ -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 @@ Requires:       perl-TimeDate perl-Time-Duration
 %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 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Oct 16 2008 Marc Bradshaw <fedora@marcbradshaw.co.uk> 0.31-3%{?dist}
+- Fix for EPEL docbook dtd version
+
 * Sat Oct 11 2008 Marc Bradshaw <fedora@marcbradshaw.co.uk> 0.31-2%{?dist}
 - Fix for EPEL docbook dtd version