rpms/colordiff/devel colordiff-1.0.9-cdiff-xz.patch, 1.1, 1.2 colordiff.spec, 1.17, 1.18

[Ville Skyttä]

Author: scop

Update of /cvs/pkgs/rpms/colordiff/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11248

Modified Files:
	colordiff-1.0.9-cdiff-xz.patch colordiff.spec 
Log Message:
* 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.


colordiff-1.0.9-cdiff-xz.patch:
 cdiff.sh  |    8 ++++----
 cdiff.xml |    6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

Index: colordiff-1.0.9-cdiff-xz.patch
===================================================================
RCS file: /cvs/pkgs/rpms/colordiff/devel/colordiff-1.0.9-cdiff-xz.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- colordiff-1.0.9-cdiff-xz.patch	20 Jul 2009 21:25:12 -0000	1.1
+++ colordiff-1.0.9-cdiff-xz.patch	29 Jul 2009 18:48:12 -0000	1.2
@@ -1,6 +1,6 @@
 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
++++ colordiff-1.0.9/cdiff.sh	2009-07-29 21:36:42.000000000 +0300
 @@ -2,7 +2,7 @@
  
  # cdiff.sh - Convenience wrapper for colordiff
@@ -10,17 +10,22 @@ diff -up colordiff-1.0.9/cdiff.sh~ color
  # 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 @@
+@@ -23,9 +23,9 @@
+     while [ "$1" != "" ]; do
          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"  ;;
+-            *.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-21 00:11:58.000000000 +0300
++++ 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>


Index: colordiff.spec
===================================================================
RCS file: /cvs/pkgs/rpms/colordiff/devel/colordiff.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- colordiff.spec	24 Jul 2009 19:15:01 -0000	1.17
+++ colordiff.spec	29 Jul 2009 18:48:13 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           colordiff
 Version:        1.0.9
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Color terminal highlighter for diff files
 
 Group:          Applications/Text
@@ -16,7 +16,6 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildArch:      noarch
 # xmlto, docbook-dtds for patch1
 BuildRequires:  xmlto, docbook-dtd412-xml
-Requires:       lzma
 Requires:       xz
 Requires:       bzip2
 Requires:       gzip
@@ -63,6 +62,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* 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