diff --git a/colordiff-1.0.7-wget111-441862.patch b/colordiff-1.0.7-wget111-441862.patch new file mode 100644 index 0000000..1d92656 --- /dev/null +++ b/colordiff-1.0.7-wget111-441862.patch @@ -0,0 +1,19 @@ +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.spec b/colordiff.spec index b5b8532..37ec471 100644 --- a/colordiff.spec +++ b/colordiff.spec @@ -1,6 +1,6 @@ Name: colordiff Version: 1.0.7 -Release: 2%{?dist} +Release: 3 Summary: Color terminal highlighter for diff files Group: Applications/Text @@ -8,6 +8,7 @@ License: GPLv2+ URL: http://colordiff.sourceforge.net/ Source0: http://colordiff.sourceforge.net/%{name}-%{version}.tar.gz Patch0: %{name}-1.0.6-colors.patch +Patch1: %{name}-1.0.7-wget111-441862.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -26,6 +27,7 @@ pretty syntax highlighting. Color schemes can be customized. %prep %setup -q %patch0 -p1 +%patch1 -p1 mv colordiffrc colordiffrc-darkbg f=CHANGES ; iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f @@ -55,6 +57,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Apr 10 2008 Ville Skyttä - 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ä - 1.0.7-2 - Upstream brown paper bag 1.0.7 re-release.