rpms/moreutils/EL-4 import.log,1.1,1.2 moreutils.spec,1.8,1.9
Marc Bradshaw
deebs at fedoraproject.org
Sat Oct 11 11:41:34 UTC 2008
Author: deebs
Update of /cvs/pkgs/rpms/moreutils/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28513/EL-4
Modified Files:
import.log moreutils.spec
Log Message:
fix for epel build
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/moreutils/EL-4/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log 27 Aug 2008 04:12:58 -0000 1.1
+++ import.log 11 Oct 2008 11:41:03 -0000 1.2
@@ -1 +1,2 @@
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
Index: moreutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moreutils/EL-4/moreutils.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- moreutils.spec 27 Aug 2008 04:12:58 -0000 1.8
+++ moreutils.spec 11 Oct 2008 11:41:03 -0000 1.9
@@ -1,6 +1,6 @@
Name: moreutils
Version: 0.31
-Release: 1%{?dist}
+Release: 2%{?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";if [ $? == "4" ];then xmlcatalog /usr/share/sgml/docbook/xmlcatalog "-//OASIS//DTD DocBook XML V4.3//EN";fi;)|grep -v "No entry"`
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
+* 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.
More information about the scm-commits
mailing list