richardfearn pushed to colordiff (el6). "Update to 1.0.11."

Tue Apr 7 18:44:37 UTC 2015

>From f4860a90ef86e3c0c1a1f3c92aec5e72f5cd37e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta at iki.fi>
Date: Sun, 7 Oct 2012 20:48:56 +0300
Subject: Update to 1.0.11.

diff --git a/colordiff-1.0.9-cdiff-xz.patch b/colordiff-1.0.9-cdiff-xz.patch
deleted file mode 100644
index ceeeb45..0000000
--- a/colordiff-1.0.9-cdiff-xz.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-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-29 21:36:42.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
-@@ -23,9 +23,9 @@
-     while [ "$1" != "" ]; do
-         file=`echo "$1" | perl -pe 's|^file:/+|/|i'`
-         case "$file" in
--            *.bz2)   cat="bzip2 -dcf" ;;
--            *.lzma)  cat="lzma -dc"   ;;
--            *)       cat="gzip -dcf"  ;;
-+            *.bz2)       cat="bzip2 -dcf" ;;
-+            *.xz|*.lzma) cat="xz -dc"     ;;
-+            *)           cat="gzip -dcf"  ;;
-         esac
-         case `echo "$file" | perl -ne 'print lc $_'` in
-         http:*|https:*|ftp:*)
-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-29 21:37:08.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>
diff --git a/colordiff.spec b/colordiff.spec
index cc59697..a65bd17 100644
--- a/colordiff.spec
+++ b/colordiff.spec
@@ -1,6 +1,6 @@
 Name:           colordiff
-Version:        1.0.10
-Release:        2%{?dist}
+Version:        1.0.11
+Release:        1%{?dist}
 Summary:        Color terminal highlighter for diff files
 
 License:        GPLv2+
@@ -8,11 +8,9 @@ URL:            http://colordiff.sourceforge.net/
 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 2009-07-21, resent 2012-06-04
-Patch1:         %{name}-1.0.9-cdiff-xz.patch
 
 BuildArch:      noarch
-# xmlto, docbook-dtds for patch1
+# xmlto, docbook-dtds because of out of date cdiff.1 in 1.0.11
 BuildRequires:  xmlto, docbook-dtd412-xml
 Requires:       xz
 Requires:       bzip2
@@ -30,13 +28,12 @@ pretty syntax highlighting.  Color schemes can be customized.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -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
 
 
 %build
-xmlto -vv man cdiff.xml
+xmlto -vv man cdiff.xml # out of date in 1.0.11
 
 
 %install
@@ -54,6 +51,9 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL_DIR=%{_bindir} \
 
 
 %changelog
+* Sun Oct  7 2012 Ville Skyttä <ville.skytta at iki.fi> - 1.0.11-1
+- Update to 1.0.11.
+
 * Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.10-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
@@ -67,73 +67,73 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL_DIR=%{_bindir} \
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.9-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
-* Wed Jul 29 2009 Ville Skyttä <ville.skytta at iki.fi> - 1.0.9-3
+* Wed Jul 29 2009 Ville Skyttä <ville.skytta at iki.fi> - 1.0.9-3
 - Update cdiff xz patch to use xz also for lzma files.
 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.9-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
-* Tue Jul 21 2009 Ville Skyttä <ville.skytta at iki.fi> - 1.0.9-1
+* 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
 
-* Mon Jan 26 2009 Ville Skyttä <ville.skytta at iki.fi> - 1.0.8a-2
+* Mon Jan 26 2009 Ville Skyttä <ville.skytta at iki.fi> - 1.0.8a-2
 - Fix man page permissions.
 
-* Mon Jan 26 2009 Ville Skyttä <ville.skytta at iki.fi> - 1.0.8a-1
+* Mon Jan 26 2009 Ville Skyttä <ville.skytta at iki.fi> - 1.0.8a-1
 - 1.0.8a.
 - Patch Makefile for DESTDIR support.
 - Patch cdiff for lzma support, man page improvements.
 
-* Thu Apr 10 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.0.7-3
+* Thu Apr 10 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.0.7-3
 - Patch to work around wget 1.11 regression, prefer curl over wget (#441862).
 - Drop disttag.
 
-* Tue Nov  6 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.0.7-2
+* Tue Nov  6 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.0.7-2
 - Upstream brown paper bag 1.0.7 re-release.
 
-* Tue Nov  6 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.0.7-1
+* Tue Nov  6 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.0.7-1
 - 1.0.7.
 
-* Sat Sep 29 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.0.6a-4
+* Sat Sep 29 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.0.6a-4
 - Requires: which
 
-* Mon Aug 13 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.0.6a-3
+* Mon Aug 13 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.0.6a-3
 - License: GPLv2+
 
-* Sat Jul  7 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.0.6a-2
+* Sat Jul  7 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.0.6a-2
 - Convert docs to UTF-8.
 
-* Sat May 12 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.0.6a-1
+* Sat May 12 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.0.6a-1
 - 1.0.6a.
 
-* Wed Apr  4 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.0.6-2
+* Wed Apr  4 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.0.6-2
 - 1.0.6.
 
-* Wed Aug 30 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.0.5-2
+* Wed Aug 30 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.0.5-2
 - Drop no longer needed Obsoletes.
 
-* Sat May 21 2005 Ville Skyttä <ville.skytta at iki.fi> - 1.0.5-1
+* Sat May 21 2005 Ville Skyttä <ville.skytta at iki.fi> - 1.0.5-1
 - Add version to cdiff Obsoletes (Matthias Saou).
 - Require diffutils (Matthias Saou, Matthew Miller).
 
-* Mon Mar 28 2005 Ville Skyttä <ville.skytta at iki.fi> - 1.0.5-0.1
+* Mon Mar 28 2005 Ville Skyttä <ville.skytta at iki.fi> - 1.0.5-0.1
 - 1.0.5.
 
-* Thu Mar 17 2005 Ville Skyttä <ville.skytta at iki.fi> - 1.0.4-0.1
+* Thu Mar 17 2005 Ville Skyttä <ville.skytta at iki.fi> - 1.0.4-0.1
 - Disable banner display in default configs.
 - Drop unnecessary Epochs.
 
-* Fri Aug 13 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:1.0.4-0.fdr.3
+* Fri Aug 13 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:1.0.4-0.fdr.3
 - Apply upstream fix for context diff detection.
 
-* Thu Aug 12 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:1.0.4-0.fdr.2
+* Thu Aug 12 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:1.0.4-0.fdr.2
 - Use lightbg as the default scheme and make it work better with dark
   backgrounds too.
 
-* Sat Jul 17 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:1.0.4-0.fdr.1
+* Sat Jul 17 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:1.0.4-0.fdr.1
 - First build.
 - Include cdiff wrapper.
diff --git a/sources b/sources
index 3722ae5..420fd15 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e3e86e2837deb884e43eacdc96a67baa  colordiff-1.0.10.tar.gz
+19ff731a3b04e8b02bd57f8b6dc47622  colordiff-1.0.11.tar.gz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/colordiff.git/commit/?h=el6&id=f4860a90ef86e3c0c1a1f3c92aec5e72f5cd37e3
