rpms/colordiff/devel colordiff-1.0.9-cdiff-xz.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 colordiff.spec, 1.15, 1.16 sources, 1.8, 1.9 colordiff-1.0.7-wget111-441862.patch, 1.1, NONE colordiff-1.0.8a-cdiff.patch, 1.1, NONE colordiff-1.0.8a-destdir.patch, 1.2, NONE
Ville Skyttä
scop at fedoraproject.org
Mon Jul 20 21:25:13 UTC 2009
Author: scop
Update of /cvs/pkgs/rpms/colordiff/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4767
Modified Files:
.cvsignore colordiff.spec sources
Added Files:
colordiff-1.0.9-cdiff-xz.patch
Removed Files:
colordiff-1.0.7-wget111-441862.patch
colordiff-1.0.8a-cdiff.patch colordiff-1.0.8a-destdir.patch
Log Message:
* Tue Jul 21 2009 Ville Skyttä <ville.skytta at iki.fi> - 1.0.9-1
- Update to 1.0.9; wget 1.11, lzma and destdir patches applied upstream.
- Patch cdiff for xz support.
colordiff-1.0.9-cdiff-xz.patch:
cdiff.sh | 3 ++-
cdiff.xml | 6 +++---
2 files changed, 5 insertions(+), 4 deletions(-)
--- NEW FILE colordiff-1.0.9-cdiff-xz.patch ---
diff -up colordiff-1.0.9/cdiff.sh~ colordiff-1.0.9/cdiff.sh
--- colordiff-1.0.9/cdiff.sh~ 2009-01-26 22:17:47.000000000 +0200
+++ colordiff-1.0.9/cdiff.sh 2009-07-21 00:20:05.000000000 +0300
@@ -2,7 +2,7 @@
# cdiff.sh - Convenience wrapper for colordiff
#
-# Copyright (C) 2003-2004 Ville Skyttä <ville.skytta at iki.fi>
+# Copyright (C) 2003-2009 Ville Skyttä <ville.skytta at iki.fi>
# Based on cdiff version 1.4 by eivind at FreeBSD.org
#
# This program is free software; you can redistribute it and/or
@@ -24,6 +24,7 @@
file=`echo "$1" | perl -pe 's|^file:/+|/|i'`
case "$file" in
*.bz2) cat="bzip2 -dcf" ;;
+ *.xz) cat="xz -dc" ;;
*.lzma) cat="lzma -dc" ;;
*) cat="gzip -dcf" ;;
esac
diff -up colordiff-1.0.9/cdiff.xml~ colordiff-1.0.9/cdiff.xml
--- colordiff-1.0.9/cdiff.xml~ 2009-01-26 22:16:44.000000000 +0200
+++ colordiff-1.0.9/cdiff.xml 2009-07-21 00:11:58.000000000 +0300
@@ -35,9 +35,9 @@ in a URL or a file, e.g.</para>
cdiff http://some.url.com/foo/thing.patch
</screen>
-<para>It also adds support for reading gzip, bzip2 and lzma compressed diffs,
-and like colordiff, also supports reading diffs from standard input if URL
-or a filename is not specified. &cdiff; pipes colordiff's output through
+<para>It also adds support for reading gzip, bzip2, xz, and lzma compressed
+diffs, and like colordiff, also supports reading diffs from standard input if
+URL or a filename is not specified. &cdiff; pipes colordiff's output through
less -R.</para>
</refsect1>
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/colordiff/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore 26 Jan 2009 17:29:16 -0000 1.7
+++ .cvsignore 20 Jul 2009 21:25:12 -0000 1.8
@@ -1 +1 @@
-colordiff-1.0.8a.tar.gz
+colordiff-1.0.9.tar.gz
Index: colordiff.spec
===================================================================
RCS file: /cvs/pkgs/rpms/colordiff/devel/colordiff.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- colordiff.spec 24 Feb 2009 08:22:50 -0000 1.15
+++ colordiff.spec 20 Jul 2009 21:25:12 -0000 1.16
@@ -1,6 +1,6 @@
Name: colordiff
-Version: 1.0.8a
-Release: 3
+Version: 1.0.9
+Release: 1%{?dist}
Summary: Color terminal highlighter for diff files
Group: Applications/Text
@@ -9,18 +9,15 @@ URL: http://colordiff.sourcef
Source0: http://colordiff.sourceforge.net/%{name}-%{version}.tar.gz
# Non-upstream, better default colors for Fedora default desktop themes
Patch0: %{name}-1.0.6-colors.patch
-# Sent upstream 2008-04-??
-Patch1: %{name}-1.0.7-wget111-441862.patch
-# Sent upstream 2009-01-26
-Patch2: %{name}-1.0.8a-destdir.patch
-# Sent upstream 2009-01-26
-Patch3: %{name}-1.0.8a-cdiff.patch
+# Sent upstream 2009-07-21
+Patch1: %{name}-1.0.9-cdiff-xz.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
-# xmlto, docbook-dtds for patch3
+# xmlto, docbook-dtds for patch1
BuildRequires: xmlto, docbook-dtd412-xml
Requires: lzma
+Requires: xz
Requires: bzip2
Requires: gzip
Requires: less
@@ -37,8 +34,6 @@ pretty syntax highlighting. Color schem
%setup -q
%patch0 -p1
%patch1 -p1
-%patch2 -p1
-%patch3 -p1
mv colordiffrc colordiffrc-darkbg ; cp -p colordiffrc-lightbg colordiffrc
f=CHANGES ; iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f
@@ -68,6 +63,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Jul 21 2009 Ville Skyttä <ville.skytta at iki.fi> - 1.0.9-1
+- Update to 1.0.9; wget 1.11, lzma and destdir patches applied upstream.
+- Patch cdiff for xz support.
+
* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.8a-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/colordiff/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources 26 Jan 2009 17:29:17 -0000 1.8
+++ sources 20 Jul 2009 21:25:13 -0000 1.9
@@ -1 +1 @@
-2355debed9a9a0183c33ef27c62feb3b colordiff-1.0.8a.tar.gz
+31864847eaa4e900f72bbb6bbc64f1ec colordiff-1.0.9.tar.gz
--- colordiff-1.0.7-wget111-441862.patch DELETED ---
--- colordiff-1.0.8a-cdiff.patch DELETED ---
--- colordiff-1.0.8a-destdir.patch DELETED ---
More information about the fedora-extras-commits
mailing list