rpms/moreutils/devel .cvsignore, 1.3, 1.4 moreutils.spec, 1.2, 1.3 sources, 1.3, 1.4
Marc Bradshaw (deebs)
fedora-extras-commits at redhat.com
Wed Dec 12 04:05:03 UTC 2007
- Previous message (by thread): rpms/perl-Moose/F-8 perl-Moose.spec,1.13,1.14 sources,1.11,1.12
- Next message (by thread): rpms/moreutils/F-7 .cvsignore, 1.3, 1.4 moreutils.spec, 1.2, 1.3 sources, 1.3, 1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: deebs
Update of /cvs/pkgs/rpms/moreutils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26123/devel
Modified Files:
.cvsignore moreutils.spec sources
Log Message:
new upstream version
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/moreutils/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 13 Nov 2007 21:18:44 -0000 1.3
+++ .cvsignore 12 Dec 2007 04:04:28 -0000 1.4
@@ -1 +1 @@
-moreutils_0.25.tar.gz
+moreutils_0.26.tar.gz
Index: moreutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moreutils/devel/moreutils.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- moreutils.spec 13 Nov 2007 21:18:44 -0000 1.2
+++ moreutils.spec 12 Dec 2007 04:04:28 -0000 1.3
@@ -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 @@
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 @@
%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 @@
%changelog
+* Wed Dec 12 2007 Marc Bradshaw <fedora at marcbradshaw.co.uk> 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 <fedora at marcbradshaw.co.uk> 0.25-1%{?dist}
- New upstream version
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/moreutils/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 13 Nov 2007 21:18:44 -0000 1.3
+++ sources 12 Dec 2007 04:04:28 -0000 1.4
@@ -1 +1 @@
-7c53737c9e84426a5d4477aba2f2c559 moreutils_0.25.tar.gz
+db7773ee7d25351d42b1d6662aa19b56 moreutils_0.26.tar.gz
- Previous message (by thread): rpms/perl-Moose/F-8 perl-Moose.spec,1.13,1.14 sources,1.11,1.12
- Next message (by thread): rpms/moreutils/F-7 .cvsignore, 1.3, 1.4 moreutils.spec, 1.2, 1.3 sources, 1.3, 1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list