Update to upstream 1.40, patches ported

.cvsignore

@@ -1 +1 @@
-transmission-1.34.tar.bz2
+transmission-1.40.tar.bz2

sources

@@ -1 +1 @@
-c4ef93639bcb895c1b3d279b2f4e27b3  transmission-1.34.tar.bz2
+490d13c141ba7b4a96582541ea83a461  transmission-1.40.tar.bz2

transmission-1.11-copt.patch

@@ -1,13 +0,0 @@
---- transmission-1.11/configure.orig	2008-05-02 15:58:10.000000000 +0200
-+++ transmission-1.11/configure	2008-05-02 15:58:20.000000000 +0200
-@@ -20809,8 +20809,8 @@
- 
- 
- if test "x$GCC" = "xyes" ; then
--    CFLAGS="-g -Wall -W -O3 -funroll-loops"
--    CXXFLAGS="-g -Wall -W -O3 -funroll-loops"
-+    CFLAGS="-Wall -W"
-+    CXXFLAGS="-Wall -W"
- fi
- { echo "$as_me:$LINENO: checking for ANSI C header files" >&5
- echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }

transmission-1.34-libevent.patch

@@ -1,197 +0,0 @@
-diff -u -r transmission-1.34.orig/configure transmission-1.34/configure
---- transmission-1.34.orig/configure	2008-09-17 03:38:32.000000000 +0200
-+++ transmission-1.34/configure	2008-09-28 11:42:58.000000000 +0200
-@@ -996,7 +996,6 @@
- LIBNOTIFY_LIBS
- DBUS_GLIB_CFLAGS
- DBUS_GLIB_LIBS'
--ac_subdirs_all='third-party/libevent'
- 
- # Initialize some variables set by options.
- ac_init_help=
-@@ -23190,15 +23189,6 @@
- 
- 
- 
--subdirs="$subdirs third-party/libevent"
--
--{ echo "$as_me:$LINENO: invoking libevent's configure script" >&5
--echo "$as_me: invoking libevent's configure script" >&6;}
--LIBEVENT_CPPFLAGS="-I\$(top_srcdir)/third-party/libevent"
--
--
--
--
- 
- pkg_failed=no
- { echo "$as_me:$LINENO: checking for GTK" >&5
-diff -u -r transmission-1.34.orig/daemon/remote.c transmission-1.34/daemon/remote.c
---- transmission-1.34.orig/daemon/remote.c	2008-09-17 03:37:40.000000000 +0200
-+++ transmission-1.34/daemon/remote.c	2008-09-28 11:45:48.000000000 +0200
-@@ -17,7 +17,7 @@
- 
- #include <unistd.h> /* getcwd */
- 
--#include <libevent/event.h>
-+#include <event.h>
- #include <curl/curl.h>
- 
- #include <libtransmission/transmission.h>
-diff -u -r transmission-1.34.orig/gtk/tr-io.c transmission-1.34/gtk/tr-io.c
---- transmission-1.34.orig/gtk/tr-io.c	2008-09-17 03:37:35.000000000 +0200
-+++ transmission-1.34/gtk/tr-io.c	2008-09-28 11:45:59.000000000 +0200
-@@ -30,7 +30,7 @@
- 
- #include <glib.h>
- 
--#include <libevent/evutil.h> /* evutil_make_socket_nonblocking */
-+#include <evutil.h> /* evutil_make_socket_nonblocking */
- 
- #include "tr-io.h"
- #include "util.h"
-diff -u -r transmission-1.34.orig/gtk/util.c transmission-1.34/gtk/util.c
---- transmission-1.34.orig/gtk/util.c	2008-09-17 03:37:35.000000000 +0200
-+++ transmission-1.34/gtk/util.c	2008-09-28 11:46:07.000000000 +0200
-@@ -37,7 +37,7 @@
- #include <dbus/dbus-glib.h>
- #endif
- 
--#include <libevent/evhttp.h>
-+#include <evhttp.h>
- 
- #include <libtransmission/transmission.h> /* TR_RATIO_NA, TR_RATIO_INF */
- #include <libtransmission/utils.h> /* tr_inf */
-diff -u -r transmission-1.34.orig/libtransmission/clients.c transmission-1.34/libtransmission/clients.c
---- transmission-1.34.orig/libtransmission/clients.c	2008-09-17 03:37:35.000000000 +0200
-+++ transmission-1.34/libtransmission/clients.c	2008-09-28 11:46:20.000000000 +0200
-@@ -17,7 +17,7 @@
- #include <stdlib.h> /* strtol */
- #include <string.h>
- 
--#include <libevent/event.h> /* evbuffer */
-+#include <event.h> /* evbuffer */
- 
- #include "transmission.h"
- #include "clients.h"
-diff -u -r transmission-1.34.orig/libtransmission/rpc-server.c transmission-1.34/libtransmission/rpc-server.c
---- transmission-1.34.orig/libtransmission/rpc-server.c	2008-09-17 03:37:35.000000000 +0200
-+++ transmission-1.34/libtransmission/rpc-server.c	2008-09-28 11:46:28.000000000 +0200
-@@ -18,7 +18,7 @@
- 
- #include <unistd.h> /* unlink */
- 
--#include <libevent/event.h>
-+#include <event.h>
- #include <shttpd/defs.h> /* edit_passwords */
- #include <shttpd/shttpd.h>
- 
-diff -u -r transmission-1.34.orig/third-party/Makefile.in transmission-1.34/third-party/Makefile.in
---- transmission-1.34.orig/third-party/Makefile.in	2008-09-17 03:38:34.000000000 +0200
-+++ transmission-1.34/third-party/Makefile.in	2008-09-28 11:43:13.000000000 +0200
-@@ -246,7 +246,6 @@
- top_srcdir = @top_srcdir@
- transmissionlocaledir = @transmissionlocaledir@
- SUBDIRS = \
--    libevent \
-     libnatpmp \
-     miniupnp \
-     shttpd
-diff -u -r transmission-1.34.orig/libtransmission/net.c transmission-1.34/libtransmission/net.c
---- transmission-1.34.orig/libtransmission/net.c	2008-09-17 03:37:35.000000000 +0200
-+++ transmission-1.34/libtransmission/net.c	2008-09-28 12:05:39.000000000 +0200
-@@ -37,6 +37,7 @@
- #include <fcntl.h>
- #endif
- 
-+#include <stdarg.h>
- #include <evutil.h>
- 
- #include "transmission.h"
-diff -u -r transmission-1.34.orig/cli/Makefile.in transmission-1.34/cli/Makefile.in
---- transmission-1.34.orig/cli/Makefile.in	2008-09-17 03:38:34.000000000 +0200
-+++ transmission-1.34/cli/Makefile.in	2008-09-28 15:07:43.000000000 +0200
-@@ -53,7 +53,6 @@
- am__DEPENDENCIES_1 =
- transmissioncli_DEPENDENCIES =  \
- 	$(top_builddir)/libtransmission/libtransmission.a \
--	$(top_builddir)/third-party/libevent/libevent_core.la \
- 	$(top_builddir)/third-party/libnatpmp/libnatpmp.a \
- 	$(top_builddir)/third-party/miniupnp/libminiupnp.a \
- 	$(top_builddir)/third-party/shttpd/libshttpd.a \
-@@ -273,7 +272,7 @@
- transmissioncli_SOURCES = cli.c
- transmissioncli_LDADD = \
-   $(top_builddir)/libtransmission/libtransmission.a \
--  $(top_builddir)/third-party/libevent/libevent_core.la \
-+  -levent -levent_core \
-   $(top_builddir)/third-party/libnatpmp/libnatpmp.a \
-   $(top_builddir)/third-party/miniupnp/libminiupnp.a \
-   $(top_builddir)/third-party/shttpd/libshttpd.a \
-diff -u -r transmission-1.34.orig/daemon/Makefile.in transmission-1.34/daemon/Makefile.in
---- transmission-1.34.orig/daemon/Makefile.in	2008-09-17 03:38:34.000000000 +0200
-+++ transmission-1.34/daemon/Makefile.in	2008-09-28 15:07:01.000000000 +0200
-@@ -58,7 +58,6 @@
- 	$(top_builddir)/third-party/shttpd/libshttpd.a \
- 	$(top_builddir)/third-party/miniupnp/libminiupnp.a \
- 	$(top_builddir)/third-party/libnatpmp/libnatpmp.a \
--	$(top_builddir)/third-party/libevent/libevent_core.la \
- 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
- am_transmission_remote_OBJECTS = remote.$(OBJEXT)
-@@ -69,7 +68,6 @@
- 	$(top_builddir)/third-party/shttpd/libshttpd.a \
- 	$(top_builddir)/third-party/miniupnp/libminiupnp.a \
- 	$(top_builddir)/third-party/libnatpmp/libnatpmp.a \
--	$(top_builddir)/third-party/libevent/libevent_core.la \
- 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
- DEFAULT_INCLUDES = -I.@am__isrc@
-@@ -293,7 +291,7 @@
-     $(top_builddir)/third-party/shttpd/libshttpd.a \
-     $(top_builddir)/third-party/miniupnp/libminiupnp.a \
-     $(top_builddir)/third-party/libnatpmp/libnatpmp.a \
--    $(top_builddir)/third-party/libevent/libevent_core.la \
-+    -levent -levent_core \
-     $(INTLLIBS) \
-     $(OPENSSL_LIBS) \
-     $(LIBCURL_LIBS) \
-diff -u -r transmission-1.34.orig/gtk/Makefile.in transmission-1.34/gtk/Makefile.in
---- transmission-1.34.orig/gtk/Makefile.in	2008-09-17 03:38:34.000000000 +0200
-+++ transmission-1.34/gtk/Makefile.in	2008-09-28 15:08:03.000000000 +0200
-@@ -64,7 +64,6 @@
- am__DEPENDENCIES_1 =
- transmission_DEPENDENCIES =  \
- 	$(top_builddir)/libtransmission/libtransmission.a \
--	$(top_builddir)/third-party/libevent/libevent_core.la \
- 	$(top_builddir)/third-party/miniupnp/libminiupnp.a \
- 	$(top_builddir)/third-party/libnatpmp/libnatpmp.a \
- 	$(top_builddir)/third-party/shttpd/libshttpd.a \
-@@ -370,7 +369,7 @@
- dist_man_MANS = transmission.1
- transmission_LDADD = \
-     $(top_builddir)/libtransmission/libtransmission.a \
--    $(top_builddir)/third-party/libevent/libevent_core.la \
-+    -levent -levent_core \
-     $(top_builddir)/third-party/miniupnp/libminiupnp.a \
-     $(top_builddir)/third-party/libnatpmp/libnatpmp.a \
-     $(top_builddir)/third-party/shttpd/libshttpd.a \
-diff -u -r transmission-1.34.orig/libtransmission/Makefile.in transmission-1.34/libtransmission/Makefile.in
---- transmission-1.34.orig/libtransmission/Makefile.in	2008-09-17 03:38:34.000000000 +0200
-+++ transmission-1.34/libtransmission/Makefile.in	2008-09-28 15:05:47.000000000 +0200
-@@ -83,7 +83,6 @@
- 	$(top_builddir)/third-party/shttpd/libshttpd.a \
- 	$(top_builddir)/third-party/miniupnp/libminiupnp.a \
- 	$(top_builddir)/third-party/libnatpmp/libnatpmp.a \
--	$(top_builddir)/third-party/libevent/libevent.la \
- 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
- bencode_test_DEPENDENCIES = $(am__DEPENDENCIES_2)
-@@ -420,7 +419,7 @@
-     $(top_builddir)/third-party/shttpd/libshttpd.a \
-     $(top_builddir)/third-party/miniupnp/libminiupnp.a \
-     $(top_builddir)/third-party/libnatpmp/libnatpmp.a \
--    $(top_builddir)/third-party/libevent/libevent.la \
-+    -levent -levent_core \
-     $(INTLLIBS) \
-     $(LIBCURL_LIBS) \
-     $(OPENSSL_LIBS) \

transmission-1.40-copt.patch

@@ -0,0 +1,13 @@
+--- transmission-1.40.orig/configure	2008-11-21 09:45:25.000000000 +0100
++++ transmission-1.40/configure	2008-11-21 09:47:58.000000000 +0100
+@@ -21454,8 +21454,8 @@
+ 
+ 
+ if test "x$GCC" = "xyes" ; then
+-    CFLAGS="-g -Wall -Wformat-security -W -Wmissing-prototypes -Wdeclaration-after-statement -O3 -funroll-loops"
+-    CXXFLAGS="-g -Wall -Wformat-security -W -O3 -funroll-loops"
++    CFLAGS="-g -Wall -Wformat-security -W -Wmissing-prototypes -Wdeclaration-after-statement"
++    CXXFLAGS="-g -Wall -Wformat-security -W"
+ fi
+ 
+ { $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5

transmission-1.40-libevent.patch

@@ -0,0 +1,188 @@
+diff -ru transmission-1.40.orig/cli/Makefile.in transmission-1.40/cli/Makefile.in
+--- transmission-1.40.orig/cli/Makefile.in	2008-11-21 09:45:25.000000000 +0100
++++ transmission-1.40/cli/Makefile.in	2008-11-21 09:53:23.000000000 +0100
+@@ -53,7 +53,6 @@
+ am__DEPENDENCIES_1 =
+ transmissioncli_DEPENDENCIES =  \
+ 	$(top_builddir)/libtransmission/libtransmission.a \
+-	$(top_builddir)/third-party/libevent/libevent.la \
+ 	$(top_builddir)/third-party/libnatpmp/libnatpmp.a \
+ 	$(top_builddir)/third-party/miniupnp/libminiupnp.a \
+ 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+@@ -288,7 +287,7 @@
+ transmissioncli_SOURCES = cli.c
+ transmissioncli_LDADD = \
+     $(top_builddir)/libtransmission/libtransmission.a \
+-    $(top_builddir)/third-party/libevent/libevent.la \
++    -levent -levent_core \
+     $(top_builddir)/third-party/libnatpmp/libnatpmp.a \
+     $(top_builddir)/third-party/miniupnp/libminiupnp.a \
+     $(INTLLIBS) \
+diff -ru transmission-1.40.orig/configure transmission-1.40/configure
+--- transmission-1.40.orig/configure	2008-11-21 09:45:25.000000000 +0100
++++ transmission-1.40/configure	2008-11-21 09:56:16.000000000 +0100
+@@ -1056,7 +1056,6 @@
+ LIBNOTIFY_LIBS
+ DBUS_GLIB_CFLAGS
+ DBUS_GLIB_LIBS'
+-ac_subdirs_all='third-party/libevent'
+ 
+ # Initialize some variables set by options.
+ ac_init_help=
+@@ -23764,16 +23763,6 @@
+ 
+ 
+ 
+-subdirs="$subdirs third-party/libevent"
+-
+-{ $as_echo "$as_me:$LINENO: invoking libevent's configure script" >&5
+-$as_echo "$as_me: invoking libevent's configure script" >&6;}
+-LIBEVENT_CPPFLAGS="-I\$(top_srcdir)/third-party/libevent"
+-
+-
+-
+-
+-
+ pkg_failed=no
+ { $as_echo "$as_me:$LINENO: checking for GTK" >&5
+ $as_echo_n "checking for GTK... " >&6; }
+diff -ru transmission-1.40.orig/daemon/Makefile.in transmission-1.40/daemon/Makefile.in
+--- transmission-1.40.orig/daemon/Makefile.in	2008-11-21 09:45:25.000000000 +0100
++++ transmission-1.40/daemon/Makefile.in	2008-11-21 09:53:54.000000000 +0100
+@@ -57,7 +57,6 @@
+ 	$(top_builddir)/libtransmission/libtransmission.a \
+ 	$(top_builddir)/third-party/miniupnp/libminiupnp.a \
+ 	$(top_builddir)/third-party/libnatpmp/libnatpmp.a \
+-	$(top_builddir)/third-party/libevent/libevent.la \
+ 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ 	$(am__DEPENDENCIES_1)
+@@ -68,7 +67,6 @@
+ 	$(top_builddir)/libtransmission/libtransmission.a \
+ 	$(top_builddir)/third-party/miniupnp/libminiupnp.a \
+ 	$(top_builddir)/third-party/libnatpmp/libnatpmp.a \
+-	$(top_builddir)/third-party/libevent/libevent.la \
+ 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ 	$(am__DEPENDENCIES_1)
+@@ -307,7 +305,7 @@
+     $(top_builddir)/libtransmission/libtransmission.a \
+     $(top_builddir)/third-party/miniupnp/libminiupnp.a \
+     $(top_builddir)/third-party/libnatpmp/libnatpmp.a \
+-    $(top_builddir)/third-party/libevent/libevent.la \
++    -levent -levent_core \
+     $(INTLLIBS) \
+     $(LIBCURL_LIBS) \
+     $(ZLIB_LIBS) \
+diff -ru transmission-1.40.orig/daemon/remote.c transmission-1.40/daemon/remote.c
+--- transmission-1.40.orig/daemon/remote.c	2008-11-21 09:45:25.000000000 +0100
++++ transmission-1.40/daemon/remote.c	2008-11-21 09:56:16.000000000 +0100
+@@ -15,7 +15,7 @@
+ #include <stdlib.h>
+ #include <string.h> /* strcmp */
+ 
+-#include <libevent/event.h>
++#include <event.h>
+ #include <curl/curl.h>
+ 
+ #include <libtransmission/transmission.h>
+diff -ru transmission-1.40.orig/gtk/Makefile.in transmission-1.40/gtk/Makefile.in
+--- transmission-1.40.orig/gtk/Makefile.in	2008-11-21 09:45:25.000000000 +0100
++++ transmission-1.40/gtk/Makefile.in	2008-11-21 09:54:28.000000000 +0100
+@@ -72,7 +72,6 @@
+ am__DEPENDENCIES_1 =
+ transmission_DEPENDENCIES =  \
+ 	$(top_builddir)/libtransmission/libtransmission.a \
+-	$(top_builddir)/third-party/libevent/libevent.la \
+ 	$(top_builddir)/third-party/miniupnp/libminiupnp.a \
+ 	$(top_builddir)/third-party/libnatpmp/libnatpmp.a \
+ 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+@@ -397,7 +396,7 @@
+ dist_man_MANS = transmission.1
+ transmission_LDADD =  \
+ 	$(top_builddir)/libtransmission/libtransmission.a \
+-	$(top_builddir)/third-party/libevent/libevent.la \
++	-levent -levent_core \
+ 	$(top_builddir)/third-party/miniupnp/libminiupnp.a \
+ 	$(top_builddir)/third-party/libnatpmp/libnatpmp.a $(GTK_LIBS) \
+ 	$(GIO_LIBS) $(LIBNOTIFY_LIBS) $(DBUS_GLIB_LIBS) \
+diff -ru transmission-1.40.orig/gtk/util.c transmission-1.40/gtk/util.c
+--- transmission-1.40.orig/gtk/util.c	2008-11-21 09:45:25.000000000 +0100
++++ transmission-1.40/gtk/util.c	2008-11-21 09:56:16.000000000 +0100
+@@ -37,7 +37,7 @@
+  #include <dbus/dbus-glib.h>
+ #endif
+ 
+-#include <libevent/evhttp.h>
++#include <evhttp.h>
+ 
+ #include <libtransmission/transmission.h> /* TR_RATIO_NA, TR_RATIO_INF */
+ #include <libtransmission/utils.h> /* tr_inf */
+diff -ru transmission-1.40.orig/libtransmission/clients.c transmission-1.40/libtransmission/clients.c
+--- transmission-1.40.orig/libtransmission/clients.c	2008-11-21 09:45:25.000000000 +0100
++++ transmission-1.40/libtransmission/clients.c	2008-11-21 09:56:16.000000000 +0100
+@@ -17,7 +17,7 @@
+ #include <stdlib.h> /* strtol */
+ #include <string.h>
+ 
+-#include <libevent/event.h> /* evbuffer */
++#include <event.h> /* evbuffer */
+ 
+ #include "transmission.h"
+ #include "clients.h"
+diff -ru transmission-1.40.orig/libtransmission/Makefile.in transmission-1.40/libtransmission/Makefile.in
+--- transmission-1.40.orig/libtransmission/Makefile.in	2008-11-21 09:45:25.000000000 +0100
++++ transmission-1.40/libtransmission/Makefile.in	2008-11-21 09:52:26.000000000 +0100
+@@ -82,7 +82,6 @@
+ am__DEPENDENCIES_2 = ./libtransmission.a \
+ 	$(top_builddir)/third-party/miniupnp/libminiupnp.a \
+ 	$(top_builddir)/third-party/libnatpmp/libnatpmp.a \
+-	$(top_builddir)/third-party/libevent/libevent.la \
+ 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ 	$(am__DEPENDENCIES_1)
+@@ -439,7 +438,7 @@
+     ./libtransmission.a  \
+     $(top_builddir)/third-party/miniupnp/libminiupnp.a \
+     $(top_builddir)/third-party/libnatpmp/libnatpmp.a \
+-    $(top_builddir)/third-party/libevent/libevent.la \
++    -levent -levent_core \
+     $(INTLLIBS) \
+     $(LIBCURL_LIBS) \
+     $(OPENSSL_LIBS) \
+diff -ru transmission-1.40.orig/libtransmission/net.c transmission-1.40/libtransmission/net.c
+--- transmission-1.40.orig/libtransmission/net.c	2008-11-21 09:45:25.000000000 +0100
++++ transmission-1.40/libtransmission/net.c	2008-11-21 09:56:16.000000000 +0100
+@@ -37,6 +37,7 @@
+  #include <fcntl.h>
+ #endif
+ 
++#include <stdarg.h>
+ #include <evutil.h>
+ 
+ #include "transmission.h"
+diff -ru transmission-1.40.orig/libtransmission/rpc-server.c transmission-1.40/libtransmission/rpc-server.c
+--- transmission-1.40.orig/libtransmission/rpc-server.c	2008-11-21 09:45:25.000000000 +0100
++++ transmission-1.40/libtransmission/rpc-server.c	2008-11-21 09:56:01.000000000 +0100
+@@ -24,8 +24,8 @@
+  #include <zlib.h>
+ #endif
+ 
+-#include <libevent/event.h>
+-#include <libevent/evhttp.h>
++#include <event.h>
++#include <evhttp.h>
+ 
+ #include "transmission.h"
+ #include "bencode.h"
+diff -ru transmission-1.40.orig/third-party/Makefile.in transmission-1.40/third-party/Makefile.in
+--- transmission-1.40.orig/third-party/Makefile.in	2008-11-21 09:45:25.000000000 +0100
++++ transmission-1.40/third-party/Makefile.in	2008-11-21 09:54:56.000000000 +0100
+@@ -253,7 +253,6 @@
+ top_srcdir = @top_srcdir@
+ transmissionlocaledir = @transmissionlocaledir@
+ SUBDIRS = \
+-    libevent \
+     libnatpmp \
+     miniupnp
+ 

transmission.spec

@@ -1,6 +1,6 @@
 
 Name:           transmission
-Version:        1.34
+Version:        1.40
 Release:        1%{?dist}
 Summary:        A lightweight GTK+ BitTorrent client
 
@@ -9,15 +9,15 @@ Group:          Applications/Internet
 License:        MIT and GPLv2
 URL:            http://www.transmissionbt.com/
 Source0:        http://download.m0k.org/transmission/files/transmission-%{version}.tar.bz2
-Patch2:         transmission-1.11-copt.patch
+Patch2:         transmission-1.40-copt.patch
-Patch3:         transmission-1.34-libevent.patch
+Patch3:         transmission-1.40-libevent.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  openssl-devel >= 0.9.4
 BuildRequires:  glib2-devel >= 2.15.5
 BuildRequires:  gtk2-devel >= 2.6.0
 BuildRequires:  libnotify-devel >= 0.4.4
-BuildRequires:  curl-devel >= 7.15.0
+BuildRequires:  curl-devel >= 7.16.3
 BuildRequires:  dbus-glib-devel >= 0.70
 BuildRequires:  libevent-devel >= 1.4.5
 BuildRequires:  desktop-file-utils
@@ -76,6 +76,10 @@ update-desktop-database > /dev/null 2>&1 || :
 
 
 %changelog
+* Fri Nov 21 2008 Denis Leroy <denis@poolshark.org> - 1.40-1
+- Update to upstream 1.40
+- Ported patches to 1.40
+
 * Sun Sep 28 2008 Denis Leroy <denis@poolshark.org> - 1.34-1
 - Update to upstream 1.34
 - Added patch to link with distributed libevent library
@@ -88,7 +92,6 @@ update-desktop-database > /dev/null 2>&1 || :
 - Now dual-licensed
 - Gnusource and download dir patches upstreamed
 
-
 * Wed Jun 18 2008 Denis Leroy <denis@poolshark.org> - 1.22-1
 - Update to upstream 1.22