rpms/transmission/devel transmission-1.40-copt.patch, NONE, 1.1 transmission-1.40-libevent.patch, NONE, 1.1 .cvsignore, 1.23, 1.24 sources, 1.23, 1.24 transmission.spec, 1.27, 1.28 transmission-1.11-copt.patch, 1.1, NONE transmission-1.34-libevent.patch, 1.1, NONE

Denis Leroy denis at fedoraproject.org
Fri Nov 21 09:16:48 UTC 2008 

Author: denis

Update of /cvs/pkgs/rpms/transmission/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7462

Modified Files:
	.cvsignore sources transmission.spec 
Added Files:
	transmission-1.40-copt.patch transmission-1.40-libevent.patch 
Removed Files:
	transmission-1.11-copt.patch transmission-1.34-libevent.patch 
Log Message:
Update to upstream 1.40, patches ported

transmission-1.40-copt.patch:

--- NEW FILE transmission-1.40-copt.patch ---
--- 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:

--- NEW FILE transmission-1.40-libevent.patch ---
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
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/transmission/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	28 Sep 2008 13:39:27 -0000	1.23
+++ .cvsignore	21 Nov 2008 09:16:17 -0000	1.24
@@ -1 +1 @@
-transmission-1.34.tar.bz2
+transmission-1.40.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/transmission/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	28 Sep 2008 13:39:27 -0000	1.23
+++ sources	21 Nov 2008 09:16:18 -0000	1.24
@@ -1 +1 @@
-c4ef93639bcb895c1b3d279b2f4e27b3  transmission-1.34.tar.bz2
+490d13c141ba7b4a96582541ea83a461  transmission-1.40.tar.bz2


Index: transmission.spec
===================================================================
RCS file: /cvs/pkgs/rpms/transmission/devel/transmission.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- transmission.spec	28 Sep 2008 13:39:27 -0000	1.27
+++ transmission.spec	21 Nov 2008 09:16:18 -0000	1.28
@@ -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 @@
 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
+Patch2:         transmission-1.40-copt.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 @@
 
 
 %changelog
+* Fri Nov 21 2008 Denis Leroy <denis at poolshark.org> - 1.40-1
+- Update to upstream 1.40
+- Ported patches to 1.40
+
 * Sun Sep 28 2008 Denis Leroy <denis at poolshark.org> - 1.34-1
 - Update to upstream 1.34
 - Added patch to link with distributed libevent library
@@ -88,7 +92,6 @@
 - Now dual-licensed
 - Gnusource and download dir patches upstreamed
 
-
 * Wed Jun 18 2008 Denis Leroy <denis at poolshark.org> - 1.22-1
 - Update to upstream 1.22
 


--- transmission-1.11-copt.patch DELETED ---


--- transmission-1.34-libevent.patch DELETED ---

More information about the scm-commits mailing list