rpms/colordiff/devel colordiff-1.0.7-wget111-441862.patch, NONE, 1.1 colordiff.spec, 1.11, 1.12
Ville Skytta (scop)
fedora-extras-commits at redhat.com
Thu Apr 10 20:09:41 UTC 2008
Author: scop
Update of /cvs/pkgs/rpms/colordiff/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8650
Modified Files:
colordiff.spec
Added Files:
colordiff-1.0.7-wget111-441862.patch
Log Message:
* 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.
colordiff-1.0.7-wget111-441862.patch:
--- NEW FILE colordiff-1.0.7-wget111-441862.patch ---
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
Index: colordiff.spec
===================================================================
RCS file: /cvs/pkgs/rpms/colordiff/devel/colordiff.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- colordiff.spec 6 Nov 2007 19:30:51 -0000 1.11
+++ colordiff.spec 10 Apr 2008 20:08:51 -0000 1.12
@@ -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 @@
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 @@
%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 @@
%changelog
+* 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
- Upstream brown paper bag 1.0.7 re-release.
More information about the scm-commits
mailing list