richardfearn pushed to colordiff (el6). "- Update to 1.0.9; wget 1.11, lzma and destdir patches applied upstream. (..more)"
notifications at fedoraproject.org
notifications at fedoraproject.org
Tue Apr 7 18:44:02 UTC 2015
>From 56dc5a8dd463b006556b4eb699bbf5f4faeb706b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <scop at fedoraproject.org>
Date: Mon, 20 Jul 2009 21:25:13 +0000
Subject: - Update to 1.0.9; wget 1.11, lzma and destdir patches applied
upstream. - Patch cdiff for xz support.
diff --git a/.cvsignore b/.cvsignore
index bf32668..b04ba7a 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-colordiff-1.0.8a.tar.gz
+colordiff-1.0.9.tar.gz
diff --git a/colordiff-1.0.7-wget111-441862.patch b/colordiff-1.0.7-wget111-441862.patch
deleted file mode 100644
index 1d92656..0000000
--- a/colordiff-1.0.7-wget111-441862.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-https://savannah.gnu.org/bugs/?22896
-
-diff -up colordiff-1.0.7/cdiff.sh~ colordiff-1.0.7/cdiff.sh
---- colordiff-1.0.7/cdiff.sh~ 2005-03-28 22:33:07.000000000 +0300
-+++ colordiff-1.0.7/cdiff.sh 2008-04-10 22:09:47.000000000 +0300
-@@ -33,10 +33,10 @@
- case `echo "$file" | perl -ne 'print lc $_'` in
- http:*|https:*|ftp:*)
- if [ -z "$CDIFF_FETCH" ]; then
-- if which wget >/dev/null 2>&1; then
-- CDIFF_FETCH="wget -qO -"
-- elif which curl >/dev/null 2>&1; then
-+ if which curl >/dev/null 2>&1; then
- CDIFF_FETCH="curl -s"
-+ elif which wget >/dev/null 2>&1; then
-+ CDIFF_FETCH="wget -e timestamping=off -qO -"
- elif which lwp-request >/dev/null 2>&1; then
- CDIFF_FETCH="lwp-request -m GET"
- elif which lynx >/dev/null 2>&1; then
diff --git a/colordiff-1.0.8a-cdiff.patch b/colordiff-1.0.8a-cdiff.patch
deleted file mode 100644
index 53e5b05..0000000
--- a/colordiff-1.0.8a-cdiff.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff -up colordiff-1.0.8a/cdiff.sh~ colordiff-1.0.8a/cdiff.sh
---- colordiff-1.0.8a/cdiff.sh~ 2005-03-28 22:33:07.000000000 +0300
-+++ colordiff-1.0.8a/cdiff.sh 2009-01-26 19:03:48.000000000 +0200
-@@ -23,12 +23,9 @@
- while [ "$1" != "" ]; do
- file=`echo "$1" | perl -pe 's|^file:/+|/|i'`
- case "$file" in
-- *.bz2)
-- cat="bzcat"
-- ;;
-- *)
-- cat="zcat -f"
-- ;;
-+ *.bz2) cat="bzip2 -dcf" ;;
-+ *.lzma) cat="lzma -dc" ;;
-+ *) cat="gzip -dcf" ;;
- esac
- case `echo "$file" | perl -ne 'print lc $_'` in
- http:*|https:*|ftp:*)
-diff -up colordiff-1.0.8a/cdiff.xml~ colordiff-1.0.8a/cdiff.xml
---- colordiff-1.0.8a/cdiff.xml~ 2009-01-25 13:18:50.000000000 +0200
-+++ colordiff-1.0.8a/cdiff.xml 2009-01-26 19:04:56.000000000 +0200
-@@ -22,19 +22,24 @@
- <refsynopsisdiv id='synopsis'>
- <cmdsynopsis>
- <command>cdiff</command>
-- <arg choice='req'><replaceable>URL</replaceable></arg>
-+ <arg choice='req'><replaceable>URL|FILE</replaceable></arg>
- </cmdsynopsis>
- </refsynopsisdiv>
-
- <refsect1 id='description'><title>Description</title>
-
- <para>&cdiff; is a wrapper for colordiff and will add colour to a diff given
--in a URL, e.g.</para>
-+in a URL or a file, e.g.</para>
-
- <screen>
- 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
-+less -R.</para>
-+
- </refsect1>
-
- <refsect1 id='seealso'><title>See Also</title>
diff --git a/colordiff-1.0.8a-destdir.patch b/colordiff-1.0.8a-destdir.patch
deleted file mode 100644
index 9b6c47f..0000000
--- a/colordiff-1.0.8a-destdir.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-diff -up colordiff-1.0.8a/Makefile~ colordiff-1.0.8a/Makefile
---- colordiff-1.0.8a/Makefile~ 2009-01-25 20:54:04.000000000 +0200
-+++ colordiff-1.0.8a/Makefile 2009-01-26 19:16:16.000000000 +0200
-@@ -20,28 +20,32 @@ doc: colordiff.xml cdiff.xml
- perl -p -i -e 's#<div class=\"refentry\"#<div id=\"content\"><div class=\"refentry\"#' colordiff.html
- mv colordiff.html ../htdocs
-
--etc:
-- sed -e "s%/etc%$(ETC_DIR)%g" colordiff.pl > colordiff.pl.for.install
--
--install: etc
-- install -D colordiff.pl.for.install ${INSTALL_DIR}/colordiff
-- if [ ! -f ${INSTALL_DIR}/cdiff ] ; then \
-- install cdiff.sh ${INSTALL_DIR}/cdiff; \
-+install:
-+ install -d ${DESTDIR}${INSTALL_DIR}
-+ sed -e "s%/etc%${ETC_DIR}%g" colordiff.pl > \
-+ ${DESTDIR}${INSTALL_DIR}/colordiff
-+ chmod +x ${DESTDIR}${INSTALL_DIR}/colordiff
-+ if [ ! -f ${DESTDIR}${INSTALL_DIR}/cdiff ] ; then \
-+ install cdiff.sh ${DESTDIR}${INSTALL_DIR}/cdiff; \
- fi
-- install -D colordiff.1 ${MAN_DIR}/colordiff.1
-- install -D cdiff.1 ${MAN_DIR}/cdiff.1
-- if [ -f ${ETC_DIR}/colordiffrc ]; then \
-- mv -f ${ETC_DIR}/colordiffrc ${ETC_DIR}/colordiffrc.old; \
-+ install -Dm 644 colordiff.1 ${DESTDIR}${MAN_DIR}/colordiff.1
-+ install -m 644 cdiff.1 ${DESTDIR}${MAN_DIR}
-+ if [ -f ${DESTDIR}${ETC_DIR}/colordiffrc ]; then \
-+ mv -f ${DESTDIR}${ETC_DIR}/colordiffrc \
-+ ${DESTDIR}${ETC_DIR}/colordiffrc.old; \
-+ else \
-+ install -d ${DESTDIR}${ETC_DIR}; \
- fi
-- cp colordiffrc ${ETC_DIR}/colordiffrc
-- chown root.root ${ETC_DIR}/colordiffrc
-- chmod 644 ${ETC_DIR}/colordiffrc
-- rm -f colordiff.pl.for.install
-+ cp colordiffrc ${DESTDIR}${ETC_DIR}/colordiffrc
-+ -chown root.root ${DESTDIR}${ETC_DIR}/colordiffrc
-+ chmod 644 ${DESTDIR}${ETC_DIR}/colordiffrc
-
--uninstall: etc
-- rm -f ${INSTALL_DIR}/colordiff
-- rm -f ${ETC_DIR}/colordiffrc
-- rm -f ${INSTALL_DIR}/cdiff
-+uninstall:
-+ rm -f ${DESTDIR}${INSTALL_DIR}/colordiff
-+ rm -f ${DESTDIR}${ETC_DIR}/colordiffrc
-+ rm -f ${DESTDIR}${INSTALL_DIR}/cdiff
-+ rm -f ${DESTDIR}${MAN_DIR}/colordiff.1
-+ rm -f ${DESTDIR}${MAN_DIR}/cdiff.1
-
- dist:
- mkdir ${TMPDIR}
diff --git a/colordiff-1.0.9-cdiff-xz.patch b/colordiff-1.0.9-cdiff-xz.patch
new file mode 100644
index 0000000..5562301
--- /dev/null
+++ b/colordiff-1.0.9-cdiff-xz.patch
@@ -0,0 +1,36 @@
+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>
diff --git a/colordiff.spec b/colordiff.spec
index 5f67ae1..b27d812 100644
--- a/colordiff.spec
+++ b/colordiff.spec
@@ -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.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 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 schemes can be customized.
%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
diff --git a/sources b/sources
index f68d51b..fd45530 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2355debed9a9a0183c33ef27c62feb3b colordiff-1.0.8a.tar.gz
+31864847eaa4e900f72bbb6bbc64f1ec colordiff-1.0.9.tar.gz
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/colordiff.git/commit/?h=el6&id=56dc5a8dd463b006556b4eb699bbf5f4faeb706b
More information about the scm-commits
mailing list