From 1734e3eda20d60488907ec73dbed87fad64aa018 Mon Sep 17 00:00:00 2001 From: Denis Leroy Date: Sep 28 2008 13:39:27 +0000 Subject: - Update to upstream 1.34 - Added patch to link with distributed libevent library --- diff --git a/.cvsignore b/.cvsignore index 38bdd1a..1e46dde 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -transmission-1.33.tar.bz2 +transmission-1.34.tar.bz2 diff --git a/sources b/sources index 7a2dd75..30ccd7b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -097a538a10e41c9e631ef23b11a2ddfa transmission-1.33.tar.bz2 +c4ef93639bcb895c1b3d279b2f4e27b3 transmission-1.34.tar.bz2 diff --git a/transmission-1.34-libevent.patch b/transmission-1.34-libevent.patch new file mode 100644 index 0000000..0c67ded --- /dev/null +++ b/transmission-1.34-libevent.patch @@ -0,0 +1,197 @@ +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 /* getcwd */ + +-#include ++#include + #include + + #include +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 + +-#include /* evutil_make_socket_nonblocking */ ++#include /* 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 + #endif + +-#include ++#include + + #include /* TR_RATIO_NA, TR_RATIO_INF */ + #include /* 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 /* strtol */ + #include + +-#include /* evbuffer */ ++#include /* 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 /* unlink */ + +-#include ++#include + #include /* edit_passwords */ + #include + +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 + #endif + ++#include + #include + + #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) \ diff --git a/transmission.spec b/transmission.spec index 296b2f9..1e413d9 100644 --- a/transmission.spec +++ b/transmission.spec @@ -1,7 +1,7 @@ Name: transmission -Version: 1.33 -Release: 2%{?dist} +Version: 1.34 +Release: 1%{?dist} Summary: A lightweight GTK+ BitTorrent client Group: Applications/Internet @@ -10,6 +10,7 @@ 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 +Patch3: transmission-1.34-libevent.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: openssl-devel >= 0.9.4 @@ -18,6 +19,7 @@ BuildRequires: gtk2-devel >= 2.6.0 BuildRequires: libnotify-devel >= 0.4.4 BuildRequires: curl-devel >= 7.15.0 BuildRequires: dbus-glib-devel >= 0.70 +BuildRequires: libevent-devel >= 1.4.5 BuildRequires: desktop-file-utils BuildRequires: gettext intltool @@ -31,6 +33,7 @@ back-end. %prep %setup -q %patch2 -p1 -b .copt +%patch3 -p1 -b .libevent %build @@ -73,6 +76,10 @@ update-desktop-database > /dev/null 2>&1 || : %changelog +* Sun Sep 28 2008 Denis Leroy - 1.34-1 +- Update to upstream 1.34 +- Added patch to link with distributed libevent library + * Mon Sep 8 2008 Tom "spot" Callaway - 1.33-2 - fix license tag