richardfearn pushed to colordiff (el6). "- Update cdiff xz patch to use xz also for lzma files."
notifications at fedoraproject.org
notifications at fedoraproject.org
Tue Apr 7 18:44:06 UTC 2015
>From 57ffdd43a332445f655a2e7a89b33873d9b7da86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <scop at fedoraproject.org>
Date: Wed, 29 Jul 2009 18:48:13 +0000
Subject: - Update cdiff xz patch to use xz also for lzma files.
diff --git a/colordiff-1.0.9-cdiff-xz.patch b/colordiff-1.0.9-cdiff-xz.patch
index 5562301..ceeeb45 100644
--- a/colordiff-1.0.9-cdiff-xz.patch
+++ b/colordiff-1.0.9-cdiff-xz.patch
@@ -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~ colordiff-1.0.9/cdiff.sh
# 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>
diff --git a/colordiff.spec b/colordiff.spec
index 2b1dbcc..defb46f 100644
--- a/colordiff.spec
+++ b/colordiff.spec
@@ -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}-%{version}-%{release}-root-%(%{__id_u} -n)
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
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/colordiff.git/commit/?h=el6&id=57ffdd43a332445f655a2e7a89b33873d9b7da86
More information about the scm-commits
mailing list