rpms/abcde/devel abcde-2.3.99.6-wget111-441862.patch, NONE, 1.1 abcde.spec, 1.17, 1.18

[Ville Skytta (scop)]

Author: scop

Update of /cvs/pkgs/rpms/abcde/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8465

Modified Files:
	abcde.spec 
Added Files:
	abcde-2.3.99.6-wget111-441862.patch 
Log Message:
* Thu Apr 10 2008 Ville Skyttä <ville.skytta at iki.fi> - 2.3.99.6-7
- Patch to work around wget 1.11 regression (#441862).


abcde-2.3.99.6-wget111-441862.patch:

--- NEW FILE abcde-2.3.99.6-wget111-441862.patch ---
https://savannah.gnu.org/bugs/?22896

diff -up abcde-2.3.99.6/abcde~ abcde-2.3.99.6/abcde
--- abcde-2.3.99.6/abcde~	2006-08-05 22:14:00.000000000 +0300
+++ abcde-2.3.99.6/abcde	2008-04-10 21:58:57.000000000 +0300
@@ -3065,7 +3065,7 @@ fi
 
 if [ "$HTTPGETOPTS" = "" ] ; then
 	case $HTTPGET in
-		wget) HTTPGETOPTS="-q -O -";;
+		wget) HTTPGETOPTS="-q -e timestamping=off -O -";;
 		curl) HTTPGETOPTS="-f -s";;
 		fetch)HTTPGETOPTS="-q -o -";;
 		ftp)  HTTPGETOPTS="-a -V -o - ";;
diff -up abcde-2.3.99.6/cddb-tool~ abcde-2.3.99.6/cddb-tool
--- abcde-2.3.99.6/cddb-tool~	2006-04-11 14:57:39.000000000 +0300
+++ abcde-2.3.99.6/cddb-tool	2008-04-10 21:58:29.000000000 +0300
@@ -44,7 +44,7 @@ if [ "$HTTPGET" = "" ]; then
 		HTTPGETOPTS=${HTTPGETOPTS:="-f -s"}
 	else
 		HTTPGET=wget
-		HTTPGETOPTS=${HTTPGETOPTS:="-q -O -"}
+		HTTPGETOPTS=${HTTPGETOPTS:="-q -e timestamping=off -O -"}
 	fi
 fi
 


Index: abcde.spec
===================================================================
RCS file: /cvs/pkgs/rpms/abcde/devel/abcde.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- abcde.spec	21 Jan 2008 07:37:11 -0000	1.17
+++ abcde.spec	10 Apr 2008 20:03:28 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           abcde
 Version:        2.3.99.6
-Release:        6
+Release:        7
 Summary:        A Better CD Encoder
 
 Group:          Applications/Multimedia
@@ -15,6 +15,7 @@
 Patch1:         %{name}_2.3.99.6-1ubuntu2.patch
 Patch2:         %{name}-2.3.99.6-usage.patch
 Patch3:         %{name}-2.3.99.6-speex-comment.patch
+Patch4:         %{name}-2.3.99.6-wget111-441862.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -37,6 +38,7 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 sed -i -e 's/normalize-audio/normalize/g' abcde*
 sed -i -e 's/^#NOGAP$/#NOGAP=y/' abcde.conf
 mv examples/cue2discid .
@@ -67,6 +69,9 @@
 
 
 %changelog
+* Thu Apr 10 2008 Ville Skyttä <ville.skytta at iki.fi> - 2.3.99.6-7
+- Patch to work around wget 1.11 regression (#441862).
+
 * Sat Jan 19 2008 Ville Skyttä <ville.skytta at iki.fi> - 2.3.99.6-6
 - Include fixes from Ubuntu's 2.3.99.6-1ubuntu2: enables M4A and Speex
   tagging, fixes range code, and the -M option.