rpms/d4x/devel d4x-2.5.7.1-speed.patch, NONE, 1.1 d4x-2.5.7.1.makebuild.patch, 1.1, 1.2 d4x.spec, 1.19, 1.20

[Matthias Saou (thias)]

Author: thias

Update of /cvs/extras/rpms/d4x/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14428/devel

Modified Files:
	d4x-2.5.7.1.makebuild.patch d4x.spec 
Added Files:
	d4x-2.5.7.1-speed.patch 
Log Message:
Include patch to fix slow download speed (#302121).


d4x-2.5.7.1-speed.patch:

--- NEW FILE d4x-2.5.7.1-speed.patch ---
--- d4x-2.5.7.1.orig/main/signal.cc
+++ d4x-2.5.7.1/main/signal.cc
@@ -89,7 +89,7 @@
 
 
 void my_pthreads_mutex_init(pthread_mutex_t *lock){
-#if defined(__linux__)
+#if defined(__linux__) || defined(__GLIBC__)
 /* manual page for mutexes said that mutexes in linux is fast by
    default...
  */
--- d4x-2.5.7.1.orig/main/socket.cc
+++ d4x-2.5.7.1/main/socket.cc
@@ -165,10 +165,10 @@
 		return(SOCKET_CANT_ALLOCATE);
 	int a=1;
 	setsockopt(fd,SOL_SOCKET,SO_KEEPALIVE,(char *)&a,sizeof(a));
-	setsockopt(fd,SOL_SOCKET,SO_KEEPALIVE,(char *)&a,sizeof(a));
+	//setsockopt(fd,SOL_SOCKET,SO_KEEPALIVE,(char *)&a,sizeof(a));
 	
 	size_t sl=2000; //set receive buffer to default+30% MTU size
-	setsockopt(fd,SOL_SOCKET,SO_RCVBUF,(char *)&sl,sizeof(sl));
+	//setsockopt(fd,SOL_SOCKET,SO_RCVBUF,(char *)&sl,sizeof(sl));
 
 	if (!connect_impl())
 		return(SOCKET_CANT_CONNECT);

d4x-2.5.7.1.makebuild.patch:

Index: d4x-2.5.7.1.makebuild.patch
===================================================================
RCS file: /cvs/extras/rpms/d4x/devel/d4x-2.5.7.1.makebuild.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- d4x-2.5.7.1.makebuild.patch	6 Jan 2008 06:53:51 -0000	1.1
+++ d4x-2.5.7.1.makebuild.patch	3 Feb 2008 18:26:13 -0000	1.2
@@ -1,7 +1,22 @@
-diff -u d4x-2.5.7.1.orig/configure.ac d4x-2.5.7.1/configure.ac
---- d4x-2.5.7.1.orig/configure.ac	2005-11-04 23:35:38.000000000 +0000
-+++ d4x-2.5.7.1/configure.ac	2008-01-05 15:01:44.000000000 +0000
-@@ -298,7 +298,6 @@
+diff -Naupr d4x-2.5.7.1.orig/configure d4x-2.5.7.1/configure
+--- d4x-2.5.7.1.orig/configure	2006-04-12 18:48:29.000000000 +0200
++++ d4x-2.5.7.1/configure	2008-02-03 19:06:53.000000000 +0100
+@@ -18398,11 +18398,6 @@ _ACEOF
+ 
+ 
+ cat >>confdefs.h <<\_ACEOF
+-#define GTK_DISABLE_DEPRECATED
+-_ACEOF
+-
+-
+-cat >>confdefs.h <<\_ACEOF
+ #define _FILE_OFFSET_BITS 64
+ _ACEOF
+ 
+diff -Naupr d4x-2.5.7.1.orig/configure.ac d4x-2.5.7.1/configure.ac
+--- d4x-2.5.7.1.orig/configure.ac	2005-11-05 00:35:38.000000000 +0100
++++ d4x-2.5.7.1/configure.ac	2008-02-03 19:06:44.000000000 +0100
+@@ -298,7 +298,6 @@ AC_DEFINE_UNQUOTED(D4X_SHARE_PATH,
  
  # Other needed defines
  AC_DEFINE(_REENTRANT, , [Enable reenrant code of glibc])
@@ -9,8 +24,9 @@
  AC_DEFINE(_FILE_OFFSET_BITS, 64, [To support files over 2GB])
  
  # Prepare all requiered flags
---- d4x-2.5.7.1.orig/main/face/list.cc	2006-03-20 00:29:41.000000000 +0000
-+++ d4x-2.5.7.1/main/face/list.cc	2008-01-05 14:52:52.000000000 +0000
+diff -Naupr d4x-2.5.7.1.orig/main/face/list.cc d4x-2.5.7.1/main/face/list.cc
+--- d4x-2.5.7.1.orig/main/face/list.cc	2006-03-20 01:29:41.000000000 +0100
++++ d4x-2.5.7.1/main/face/list.cc	2008-02-03 19:06:44.000000000 +0100
 @@ -8,8 +8,6 @@
   *	but WITHOUT ANY WARRANTY; without even the implied warranty of
   *	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.


Index: d4x.spec
===================================================================
RCS file: /cvs/extras/rpms/d4x/devel/d4x.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- d4x.spec	6 Jan 2008 06:53:51 -0000	1.19
+++ d4x.spec	3 Feb 2008 18:26:13 -0000	1.20
@@ -1,7 +1,7 @@
 Summary: Downloader for X that supports resuming and many other features
 Name: d4x
 Version: 2.5.7.1
-Release: 7%{?dist}
+Release: 8%{?dist}
 Group: Applications/Internet
 License: Artistic
 URL: http://www.krasu.ru/soft/chuchelo/
@@ -9,10 +9,11 @@
 Patch0: d4x-2.5.7.1-man.patch
 Patch1: d4x-2.5.7.1-desktop.patch
 Patch2: d4x-2.5.7.1.makebuild.patch
+Patch3: d4x-2.5.7.1-speed.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: gtk2-devel, libao-devel, openssl-devel
 BuildRequires: desktop-file-utils, boost-devel
-BuildRequires: libXt-devel, autoconf
+BuildRequires: libXt-devel
 
 %description
 This program lets you download files from the internet using either the ftp
@@ -28,9 +29,16 @@
 %patch0 -p1 -b .man
 %patch1 -p1 -b .desktop
 %patch2 -p1 -b .makebuild
+%patch3 -p1 -b .speed
 # Move the desktop file we just patched to the proper name
 %{__mv} share/nt.desktop share/d4x.desktop
-autoconf
+# Convert some docs to UTF-8, keeping their original timestamps
+for file in DOC/FAQ.* NEWS; do
+    cp -a ${file} tmp
+    iconv -f iso8859-1 -t utf-8 tmp > ${file}
+    touch -r tmp ${file}
+    rm -f tmp
+done
 
 
 %build
@@ -87,12 +95,20 @@
 
 
 %changelog
+* Sun Feb  3 2008 Matthias Saou <http://freshrpms.net/> 2.5.7.1-8
+- Rebuild with the changes from Mon Sep 24 2007 merged back in.
+- Replace autoconf run with a few more lines to the makebuild patch.
+
 * Sat Jan  5 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 2.5.7.1-7
 - Add patch by Caolan McNamara (#427620) to build against new openssl
 
 * Wed Dec 05 2007 Release Engineering <rel-eng at fedoraproject dot org> - 2.5.7.1-6
  - Rebuild for deps
 
+* Mon Sep 24 2007 Matthias Saou <http://freshrpms.net/> 2.5.7.1-6
+- Include patch to fix slow download speeds (#302121).
+- Convert doc files to UTF-8.
+
 * Fri Aug 31 2007 Matthias Saou <http://freshrpms.net/> 2.5.7.1-5
 - Rebuild for new BuildID feature.
 - License is still original Artistic, but this should be fixed shortly.