From 51522b082ed21d3cbb59dddb86d7f4ebc4b04aaf Mon Sep 17 00:00:00 2001 From: Brian Pepple Date: Dec 31 2008 18:19:20 +0000 Subject: - Update to 1.42. - Update event patch to 1.42. --- diff --git a/.cvsignore b/.cvsignore index 148d38a..9d3243d 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -transmission-1.40.tar.bz2 +transmission-1.42.tar.bz2 diff --git a/sources b/sources index 0f81ea7..24fe474 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -490d13c141ba7b4a96582541ea83a461 transmission-1.40.tar.bz2 +c083bdcb01426466e80ee339bccd9351 transmission-1.42.tar.bz2 diff --git a/transmission-1.40-libevent.patch b/transmission-1.40-libevent.patch deleted file mode 100644 index ab0a7ba..0000000 --- a/transmission-1.40-libevent.patch +++ /dev/null @@ -1,188 +0,0 @@ -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 - #include /* strcmp */ - --#include -+#include - #include - - #include -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 - #endif - --#include -+#include - - #include /* TR_RATIO_NA, TR_RATIO_INF */ - #include /* 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 /* strtol */ - #include - --#include /* evbuffer */ -+#include /* 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 - #endif - -+#include - #include - - #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 - #endif - --#include --#include -+#include -+#include - - #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 - diff --git a/transmission-1.42-libevent.patch b/transmission-1.42-libevent.patch new file mode 100644 index 0000000..a66a1a4 --- /dev/null +++ b/transmission-1.42-libevent.patch @@ -0,0 +1,188 @@ +diff -ur transmission-1.42.OLD/cli/Makefile.in transmission-1.42/cli/Makefile.in +--- transmission-1.42.OLD/cli/Makefile.in 2008-12-24 12:53:03.000000000 -0500 ++++ transmission-1.42/cli/Makefile.in 2008-12-31 11:30:31.000000000 -0500 +@@ -54,7 +54,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) \ +@@ -289,7 +288,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 -ur transmission-1.42.OLD/configure transmission-1.42/configure +--- transmission-1.42.OLD/configure 2008-12-24 12:53:05.000000000 -0500 ++++ transmission-1.42/configure 2008-12-31 11:31:37.000000000 -0500 +@@ -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= +@@ -23820,16 +23819,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 -ur transmission-1.42.OLD/daemon/Makefile.in transmission-1.42/daemon/Makefile.in +--- transmission-1.42.OLD/daemon/Makefile.in 2008-12-24 12:53:03.000000000 -0500 ++++ transmission-1.42/daemon/Makefile.in 2008-12-31 11:33:13.000000000 -0500 +@@ -58,7 +58,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) +@@ -69,7 +68,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) +@@ -308,7 +306,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 -ur transmission-1.42.OLD/daemon/remote.c transmission-1.42/daemon/remote.c +--- transmission-1.42.OLD/daemon/remote.c 2008-12-24 12:48:44.000000000 -0500 ++++ transmission-1.42/daemon/remote.c 2008-12-31 11:34:05.000000000 -0500 +@@ -15,7 +15,7 @@ + #include + #include /* strcmp */ + +-#include ++#include + #include + + #include +diff -ur transmission-1.42.OLD/gtk/Makefile.in transmission-1.42/gtk/Makefile.in +--- transmission-1.42.OLD/gtk/Makefile.in 2008-12-24 12:53:03.000000000 -0500 ++++ transmission-1.42/gtk/Makefile.in 2008-12-31 11:35:10.000000000 -0500 +@@ -73,7 +73,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) \ +@@ -398,7 +397,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 -ur transmission-1.42.OLD/gtk/util.c transmission-1.42/gtk/util.c +--- transmission-1.42.OLD/gtk/util.c 2008-12-24 12:48:40.000000000 -0500 ++++ transmission-1.42/gtk/util.c 2008-12-31 11:35:56.000000000 -0500 +@@ -37,7 +37,7 @@ + #include + #endif + +-#include ++#include + + #include /* TR_RATIO_NA, TR_RATIO_INF */ + #include /* tr_inf */ +diff -ur transmission-1.42.OLD/libtransmission/clients.c transmission-1.42/libtransmission/clients.c +--- transmission-1.42.OLD/libtransmission/clients.c 2008-12-24 12:48:40.000000000 -0500 ++++ transmission-1.42/libtransmission/clients.c 2008-12-31 11:36:35.000000000 -0500 +@@ -17,7 +17,7 @@ + #include /* strtol */ + #include + +-#include /* evbuffer */ ++#include /* evbuffer */ + + #include "transmission.h" + #include "clients.h" +diff -ur transmission-1.42.OLD/libtransmission/Makefile.in transmission-1.42/libtransmission/Makefile.in +--- transmission-1.42.OLD/libtransmission/Makefile.in 2008-12-24 12:53:03.000000000 -0500 ++++ transmission-1.42/libtransmission/Makefile.in 2008-12-31 11:38:46.000000000 -0500 +@@ -83,7 +83,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) +@@ -466,7 +465,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 -ur transmission-1.42.OLD/libtransmission/net.c transmission-1.42/libtransmission/net.c +--- transmission-1.42.OLD/libtransmission/net.c 2008-12-24 12:48:40.000000000 -0500 ++++ transmission-1.42/libtransmission/net.c 2008-12-31 11:39:24.000000000 -0500 +@@ -37,6 +37,7 @@ + #include + #endif + ++#include + #include + + #include "transmission.h" +diff -ur transmission-1.42.OLD/libtransmission/rpc-server.c transmission-1.42/libtransmission/rpc-server.c +--- transmission-1.42.OLD/libtransmission/rpc-server.c 2008-12-24 12:48:40.000000000 -0500 ++++ transmission-1.42/libtransmission/rpc-server.c 2008-12-31 11:39:53.000000000 -0500 +@@ -24,8 +24,8 @@ + #include + #endif + +-#include +-#include ++#include ++#include + + #include "transmission.h" + #include "bencode.h" +diff -ur transmission-1.42.OLD/third-party/Makefile.in transmission-1.42/third-party/Makefile.in +--- transmission-1.42.OLD/third-party/Makefile.in 2008-12-24 12:53:03.000000000 -0500 ++++ transmission-1.42/third-party/Makefile.in 2008-12-31 11:40:42.000000000 -0500 +@@ -254,7 +254,6 @@ + top_srcdir = @top_srcdir@ + transmissionlocaledir = @transmissionlocaledir@ + SUBDIRS = \ +- libevent \ + libnatpmp \ + miniupnp + diff --git a/transmission.spec b/transmission.spec index 27b7058..81d3b87 100644 --- a/transmission.spec +++ b/transmission.spec @@ -1,6 +1,6 @@ Name: transmission -Version: 1.40 +Version: 1.42 Release: 1%{?dist} Summary: A lightweight GTK+ BitTorrent client @@ -10,7 +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.40-copt.patch -Patch3: transmission-1.40-libevent.patch +Patch3: transmission-1.42-libevent.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: openssl-devel >= 0.9.4 @@ -76,6 +76,10 @@ update-desktop-database > /dev/null 2>&1 || : %changelog +* Wed Dec 31 2008 Brian Pepple - 1.42-1 +- Update to 1.42. +- Update event patch to 1.42. + * Fri Nov 21 2008 Denis Leroy - 1.40-1 - Update to upstream 1.40 - Ported patches to 1.40