diff --git a/.cvsignore b/.cvsignore index 72cc373..8f2df32 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -moreutils_0.25.tar.gz +moreutils_0.26.tar.gz diff --git a/moreutils.spec b/moreutils.spec index d7ef270..7d94418 100644 --- a/moreutils.spec +++ b/moreutils.spec @@ -1,5 +1,5 @@ Name: moreutils -Version: 0.25 +Version: 0.26 Release: 1%{?dist} Summary: Additional unix utilities Group: Applications/System @@ -7,7 +7,7 @@ License: GPLv2 URL: http://kitenet.net/~joey/code/moreutils/ Source0: http://ftp.debian.org/debian/pool/main/m/%{name}/%{name}_%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: docbook2X docbook-dtds +BuildRequires: docbook2X docbook-dtds libxml2 Requires: perl-TimeDate perl-Time-Duration # These perl modules add functionality to the ts command, as they are added in eval'd code they are not # picked up automatically by rpm. @@ -32,11 +32,12 @@ 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 -sed -r -i "s/\/usr\/share\/xml\/docbook\/schema\/dtd\/4.4\/docbookx\.dtd/\/usr\/share\/sgml\/docbook\/xml-dtd-4.4-1.0-30.1\/docbookx.dtd/" *.docbook +DTDFILE=`xmlcatalog /usr/share/sgml/docbook/xmlcatalog "-//OASIS//DTD DocBook XML V4.4//EN"` +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 +sed -r -i "s|docbook2x-man|db2x_docbook2man|" Makefile # a slightly different syntax is required here for the man pages to be built successfully -sed -r -i "s/ rep=\"repeat\"//" *.docbook +sed -r -i "s| rep=\"repeat\"||" *.docbook %build @@ -82,6 +83,11 @@ rm -rf %{buildroot} %changelog +* Wed Dec 12 2007 Marc Bradshaw 0.26-1%{?dist} +- Docboox dtd path will now be found using xmlcatalog. +- New upstream version released with these changes +- isutf8: Correct inverted exit code when passed a file to check. + * Wed Nov 14 2007 Marc Bradshaw 0.25-1%{?dist} - New upstream version diff --git a/sources b/sources index bf91d6c..de68dce 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7c53737c9e84426a5d4477aba2f2c559 moreutils_0.25.tar.gz +db7773ee7d25351d42b1d6662aa19b56 moreutils_0.26.tar.gz