- Update to upstream 1.50

- Ported patches to 1.50, enforce compile flags
epel9
Denis Leroy 16 years ago
parent 5d427e71b9
commit 7651f14109

@ -1 +1 @@
transmission-1.42.tar.bz2 transmission-1.50.tar.bz2

@ -1 +1 @@
c083bdcb01426466e80ee339bccd9351 transmission-1.42.tar.bz2 9342004249f09d5e8f87f9bd1476fa53 transmission-1.50.tar.bz2

@ -1,13 +0,0 @@
--- 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

@ -0,0 +1,32 @@
--- transmission-1.50/configure~ 2009-02-13 17:43:45.000000000 +0100
+++ transmission-1.50/configure 2009-02-20 12:07:14.000000000 +0100
@@ -20147,8 +20147,6 @@
if test 0 = "0"; then
supported_build=yes
- CFLAGS="$CFLAGS -g -O3 -funroll-loops "
- CXXFLAGS="$CXXFLAGS -g -O3 -funroll-loops "
cat >>confdefs.h <<\_ACEOF
#define TR_STABLE_RELEASE 1
@@ -20156,8 +20154,6 @@
else
supported_build=no
- CFLAGS="$CFLAGS -g -O0"
- CXXFLAGS="$CXXFLAGS -g -O0"
if test 0 = "X"; then
cat >>confdefs.h <<\_ACEOF
@@ -21539,11 +21535,6 @@
;;
esac
-if test "x$GCC" = "xyes" ; then
- CFLAGS="-std=gnu99 -ggdb3 -Wall -Wextra -Wredundant-decls -Wpointer-arith -Wformat-security -W -Wmissing-declarations -Wdeclaration-after-statement -Wcast-align -Winit-self -Wundef -Wnested-externs -Wmissing-format-attribute"
- CXXFLAGS="-Wall -Wformat-security -W"
-fi
-
{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
$as_echo_n "checking for ANSI C header files... " >&6; }
if test "${ac_cv_header_stdc+set}" = set; then

@ -1,7 +1,7 @@
diff -ur transmission-1.42.OLD/cli/Makefile.in transmission-1.42/cli/Makefile.in diff -r -u transmission-1.50.orig/cli/Makefile.in transmission-1.50/cli/Makefile.in
--- transmission-1.42.OLD/cli/Makefile.in 2008-12-24 12:53:03.000000000 -0500 --- transmission-1.50.orig/cli/Makefile.in 2009-02-13 17:43:47.000000000 +0100
+++ transmission-1.42/cli/Makefile.in 2008-12-31 11:30:31.000000000 -0500 +++ transmission-1.50/cli/Makefile.in 2009-02-20 11:20:28.000000000 +0100
@@ -54,7 +54,6 @@ @@ -53,7 +53,6 @@
am__DEPENDENCIES_1 = am__DEPENDENCIES_1 =
transmissioncli_DEPENDENCIES = \ transmissioncli_DEPENDENCIES = \
$(top_builddir)/libtransmission/libtransmission.a \ $(top_builddir)/libtransmission/libtransmission.a \
@ -9,7 +9,7 @@ diff -ur transmission-1.42.OLD/cli/Makefile.in transmission-1.42/cli/Makefile.in
$(top_builddir)/third-party/libnatpmp/libnatpmp.a \ $(top_builddir)/third-party/libnatpmp/libnatpmp.a \
$(top_builddir)/third-party/miniupnp/libminiupnp.a \ $(top_builddir)/third-party/miniupnp/libminiupnp.a \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -289,7 +288,7 @@ @@ -288,7 +287,7 @@
transmissioncli_SOURCES = cli.c transmissioncli_SOURCES = cli.c
transmissioncli_LDADD = \ transmissioncli_LDADD = \
$(top_builddir)/libtransmission/libtransmission.a \ $(top_builddir)/libtransmission/libtransmission.a \
@ -18,10 +18,10 @@ diff -ur transmission-1.42.OLD/cli/Makefile.in transmission-1.42/cli/Makefile.in
$(top_builddir)/third-party/libnatpmp/libnatpmp.a \ $(top_builddir)/third-party/libnatpmp/libnatpmp.a \
$(top_builddir)/third-party/miniupnp/libminiupnp.a \ $(top_builddir)/third-party/miniupnp/libminiupnp.a \
$(INTLLIBS) \ $(INTLLIBS) \
diff -ur transmission-1.42.OLD/configure transmission-1.42/configure diff -r -u transmission-1.50.orig/configure transmission-1.50/configure
--- transmission-1.42.OLD/configure 2008-12-24 12:53:05.000000000 -0500 --- transmission-1.50.orig/configure 2009-02-13 17:43:45.000000000 +0100
+++ transmission-1.42/configure 2008-12-31 11:31:37.000000000 -0500 +++ transmission-1.50/configure 2009-02-20 11:20:57.000000000 +0100
@@ -1056,7 +1056,6 @@ @@ -1053,7 +1053,6 @@
LIBNOTIFY_LIBS LIBNOTIFY_LIBS
DBUS_GLIB_CFLAGS DBUS_GLIB_CFLAGS
DBUS_GLIB_LIBS' DBUS_GLIB_LIBS'
@ -29,7 +29,7 @@ diff -ur transmission-1.42.OLD/configure transmission-1.42/configure
# Initialize some variables set by options. # Initialize some variables set by options.
ac_init_help= ac_init_help=
@@ -23820,16 +23819,6 @@ @@ -23905,16 +23904,6 @@
@ -46,10 +46,10 @@ diff -ur transmission-1.42.OLD/configure transmission-1.42/configure
pkg_failed=no pkg_failed=no
{ $as_echo "$as_me:$LINENO: checking for GTK" >&5 { $as_echo "$as_me:$LINENO: checking for GTK" >&5
$as_echo_n "checking for GTK... " >&6; } $as_echo_n "checking for GTK... " >&6; }
diff -ur transmission-1.42.OLD/daemon/Makefile.in transmission-1.42/daemon/Makefile.in diff -r -u transmission-1.50.orig/daemon/Makefile.in transmission-1.50/daemon/Makefile.in
--- transmission-1.42.OLD/daemon/Makefile.in 2008-12-24 12:53:03.000000000 -0500 --- transmission-1.50.orig/daemon/Makefile.in 2009-02-13 17:43:48.000000000 +0100
+++ transmission-1.42/daemon/Makefile.in 2008-12-31 11:33:13.000000000 -0500 +++ transmission-1.50/daemon/Makefile.in 2009-02-20 11:29:43.000000000 +0100
@@ -58,7 +58,6 @@ @@ -57,7 +57,6 @@
$(top_builddir)/libtransmission/libtransmission.a \ $(top_builddir)/libtransmission/libtransmission.a \
$(top_builddir)/third-party/miniupnp/libminiupnp.a \ $(top_builddir)/third-party/miniupnp/libminiupnp.a \
$(top_builddir)/third-party/libnatpmp/libnatpmp.a \ $(top_builddir)/third-party/libnatpmp/libnatpmp.a \
@ -57,15 +57,16 @@ diff -ur transmission-1.42.OLD/daemon/Makefile.in transmission-1.42/daemon/Makef
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
@@ -69,7 +68,6 @@ @@ -68,7 +67,7 @@
$(top_builddir)/libtransmission/libtransmission.a \ $(top_builddir)/libtransmission/libtransmission.a \
$(top_builddir)/third-party/miniupnp/libminiupnp.a \ $(top_builddir)/third-party/miniupnp/libminiupnp.a \
$(top_builddir)/third-party/libnatpmp/libnatpmp.a \ $(top_builddir)/third-party/libnatpmp/libnatpmp.a \
- $(top_builddir)/third-party/libevent/libevent.la \ - $(top_builddir)/third-party/libevent/libevent.la \
+ -levent -levent_core \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
@@ -308,7 +306,7 @@ @@ -307,7 +306,7 @@
$(top_builddir)/libtransmission/libtransmission.a \ $(top_builddir)/libtransmission/libtransmission.a \
$(top_builddir)/third-party/miniupnp/libminiupnp.a \ $(top_builddir)/third-party/miniupnp/libminiupnp.a \
$(top_builddir)/third-party/libnatpmp/libnatpmp.a \ $(top_builddir)/third-party/libnatpmp/libnatpmp.a \
@ -74,22 +75,22 @@ diff -ur transmission-1.42.OLD/daemon/Makefile.in transmission-1.42/daemon/Makef
$(INTLLIBS) \ $(INTLLIBS) \
$(LIBCURL_LIBS) \ $(LIBCURL_LIBS) \
$(ZLIB_LIBS) \ $(ZLIB_LIBS) \
diff -ur transmission-1.42.OLD/daemon/remote.c transmission-1.42/daemon/remote.c diff -r -u transmission-1.50.orig/daemon/remote.c transmission-1.50/daemon/remote.c
--- transmission-1.42.OLD/daemon/remote.c 2008-12-24 12:48:44.000000000 -0500 --- transmission-1.50.orig/daemon/remote.c 2009-02-13 17:41:10.000000000 +0100
+++ transmission-1.42/daemon/remote.c 2008-12-31 11:34:05.000000000 -0500 +++ transmission-1.50/daemon/remote.c 2009-02-20 11:21:36.000000000 +0100
@@ -15,7 +15,7 @@ @@ -21,7 +21,7 @@
#include <stdlib.h> #include <unistd.h> /* getcwd */
#include <string.h> /* strcmp */ #endif
-#include <libevent/event.h> -#include <libevent/event.h>
+#include <event.h> +#include <event.h>
#include <curl/curl.h>
#include <libtransmission/transmission.h> #define CURL_DISABLE_TYPECHECK /* otherwise -Wunreachable-code goes insane */
diff -ur transmission-1.42.OLD/gtk/Makefile.in transmission-1.42/gtk/Makefile.in #include <curl/curl.h>
--- transmission-1.42.OLD/gtk/Makefile.in 2008-12-24 12:53:03.000000000 -0500 diff -r -u transmission-1.50.orig/gtk/Makefile.in transmission-1.50/gtk/Makefile.in
+++ transmission-1.42/gtk/Makefile.in 2008-12-31 11:35:10.000000000 -0500 --- transmission-1.50.orig/gtk/Makefile.in 2009-02-13 17:43:48.000000000 +0100
@@ -73,7 +73,6 @@ +++ transmission-1.50/gtk/Makefile.in 2009-02-20 11:22:10.000000000 +0100
@@ -72,7 +72,6 @@
am__DEPENDENCIES_1 = am__DEPENDENCIES_1 =
transmission_DEPENDENCIES = \ transmission_DEPENDENCIES = \
$(top_builddir)/libtransmission/libtransmission.a \ $(top_builddir)/libtransmission/libtransmission.a \
@ -97,7 +98,7 @@ diff -ur transmission-1.42.OLD/gtk/Makefile.in transmission-1.42/gtk/Makefile.in
$(top_builddir)/third-party/miniupnp/libminiupnp.a \ $(top_builddir)/third-party/miniupnp/libminiupnp.a \
$(top_builddir)/third-party/libnatpmp/libnatpmp.a \ $(top_builddir)/third-party/libnatpmp/libnatpmp.a \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -398,7 +397,7 @@ @@ -397,7 +396,7 @@
dist_man_MANS = transmission.1 dist_man_MANS = transmission.1
transmission_LDADD = \ transmission_LDADD = \
$(top_builddir)/libtransmission/libtransmission.a \ $(top_builddir)/libtransmission/libtransmission.a \
@ -106,10 +107,10 @@ diff -ur transmission-1.42.OLD/gtk/Makefile.in transmission-1.42/gtk/Makefile.in
$(top_builddir)/third-party/miniupnp/libminiupnp.a \ $(top_builddir)/third-party/miniupnp/libminiupnp.a \
$(top_builddir)/third-party/libnatpmp/libnatpmp.a $(GTK_LIBS) \ $(top_builddir)/third-party/libnatpmp/libnatpmp.a $(GTK_LIBS) \
$(GIO_LIBS) $(LIBNOTIFY_LIBS) $(DBUS_GLIB_LIBS) \ $(GIO_LIBS) $(LIBNOTIFY_LIBS) $(DBUS_GLIB_LIBS) \
diff -ur transmission-1.42.OLD/gtk/util.c transmission-1.42/gtk/util.c diff -r -u transmission-1.50.orig/gtk/util.c transmission-1.50/gtk/util.c
--- transmission-1.42.OLD/gtk/util.c 2008-12-24 12:48:40.000000000 -0500 --- transmission-1.50.orig/gtk/util.c 2009-02-13 17:40:54.000000000 +0100
+++ transmission-1.42/gtk/util.c 2008-12-31 11:35:56.000000000 -0500 +++ transmission-1.50/gtk/util.c 2009-02-20 11:22:18.000000000 +0100
@@ -37,7 +37,7 @@ @@ -38,7 +38,7 @@
#include <dbus/dbus-glib.h> #include <dbus/dbus-glib.h>
#endif #endif
@ -118,9 +119,9 @@ diff -ur transmission-1.42.OLD/gtk/util.c transmission-1.42/gtk/util.c
#include <libtransmission/transmission.h> /* TR_RATIO_NA, TR_RATIO_INF */ #include <libtransmission/transmission.h> /* TR_RATIO_NA, TR_RATIO_INF */
#include <libtransmission/utils.h> /* tr_inf */ #include <libtransmission/utils.h> /* tr_inf */
diff -ur transmission-1.42.OLD/libtransmission/clients.c transmission-1.42/libtransmission/clients.c diff -r -u transmission-1.50.orig/libtransmission/clients.c transmission-1.50/libtransmission/clients.c
--- transmission-1.42.OLD/libtransmission/clients.c 2008-12-24 12:48:40.000000000 -0500 --- transmission-1.50.orig/libtransmission/clients.c 2009-02-13 17:40:53.000000000 +0100
+++ transmission-1.42/libtransmission/clients.c 2008-12-31 11:36:35.000000000 -0500 +++ transmission-1.50/libtransmission/clients.c 2009-02-20 11:22:34.000000000 +0100
@@ -17,7 +17,7 @@ @@ -17,7 +17,7 @@
#include <stdlib.h> /* strtol */ #include <stdlib.h> /* strtol */
#include <string.h> #include <string.h>
@ -130,10 +131,22 @@ diff -ur transmission-1.42.OLD/libtransmission/clients.c transmission-1.42/libtr
#include "transmission.h" #include "transmission.h"
#include "clients.h" #include "clients.h"
diff -ur transmission-1.42.OLD/libtransmission/Makefile.in transmission-1.42/libtransmission/Makefile.in diff -r -u transmission-1.50.orig/libtransmission/fdlimit.c transmission-1.50/libtransmission/fdlimit.c
--- transmission-1.42.OLD/libtransmission/Makefile.in 2008-12-24 12:53:03.000000000 -0500 --- transmission-1.50.orig/libtransmission/fdlimit.c 2009-02-13 17:40:53.000000000 +0100
+++ transmission-1.42/libtransmission/Makefile.in 2008-12-31 11:38:46.000000000 -0500 +++ transmission-1.50/libtransmission/fdlimit.c 2009-02-20 11:28:30.000000000 +0100
@@ -83,7 +83,6 @@ @@ -56,7 +56,7 @@
#include <unistd.h>
#include <fcntl.h> /* O_LARGEFILE posix_fadvise */
-#include <evutil.h>
+#include <event.h>
#include "transmission.h"
#include "fdlimit.h"
diff -r -u transmission-1.50.orig/libtransmission/Makefile.in transmission-1.50/libtransmission/Makefile.in
--- transmission-1.50.orig/libtransmission/Makefile.in 2009-02-13 17:43:48.000000000 +0100
+++ transmission-1.50/libtransmission/Makefile.in 2009-02-20 11:23:02.000000000 +0100
@@ -82,7 +82,6 @@
am__DEPENDENCIES_2 = ./libtransmission.a \ am__DEPENDENCIES_2 = ./libtransmission.a \
$(top_builddir)/third-party/miniupnp/libminiupnp.a \ $(top_builddir)/third-party/miniupnp/libminiupnp.a \
$(top_builddir)/third-party/libnatpmp/libnatpmp.a \ $(top_builddir)/third-party/libnatpmp/libnatpmp.a \
@ -141,7 +154,7 @@ diff -ur transmission-1.42.OLD/libtransmission/Makefile.in transmission-1.42/lib
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
@@ -466,7 +465,7 @@ @@ -472,7 +471,7 @@
./libtransmission.a \ ./libtransmission.a \
$(top_builddir)/third-party/miniupnp/libminiupnp.a \ $(top_builddir)/third-party/miniupnp/libminiupnp.a \
$(top_builddir)/third-party/libnatpmp/libnatpmp.a \ $(top_builddir)/third-party/libnatpmp/libnatpmp.a \
@ -150,20 +163,21 @@ diff -ur transmission-1.42.OLD/libtransmission/Makefile.in transmission-1.42/lib
$(INTLLIBS) \ $(INTLLIBS) \
$(LIBCURL_LIBS) \ $(LIBCURL_LIBS) \
$(OPENSSL_LIBS) \ $(OPENSSL_LIBS) \
diff -ur transmission-1.42.OLD/libtransmission/net.c transmission-1.42/libtransmission/net.c diff -r -u transmission-1.50.orig/libtransmission/net.c transmission-1.50/libtransmission/net.c
--- transmission-1.42.OLD/libtransmission/net.c 2008-12-24 12:48:40.000000000 -0500 --- transmission-1.50.orig/libtransmission/net.c 2009-02-13 17:40:53.000000000 +0100
+++ transmission-1.42/libtransmission/net.c 2008-12-31 11:39:24.000000000 -0500 +++ transmission-1.50/libtransmission/net.c 2009-02-20 11:28:24.000000000 +0100
@@ -37,6 +37,7 @@ @@ -39,7 +39,7 @@
#include <fcntl.h> #include <fcntl.h>
#endif #endif
+#include <stdarg.h> -#include <evutil.h>
#include <evutil.h> +#include <event.h>
#include "transmission.h" #include "transmission.h"
diff -ur transmission-1.42.OLD/libtransmission/rpc-server.c transmission-1.42/libtransmission/rpc-server.c #include "fdlimit.h"
--- transmission-1.42.OLD/libtransmission/rpc-server.c 2008-12-24 12:48:40.000000000 -0500 diff -r -u transmission-1.50.orig/libtransmission/rpc-server.c transmission-1.50/libtransmission/rpc-server.c
+++ transmission-1.42/libtransmission/rpc-server.c 2008-12-31 11:39:53.000000000 -0500 --- transmission-1.50.orig/libtransmission/rpc-server.c 2009-02-13 17:40:53.000000000 +0100
+++ transmission-1.50/libtransmission/rpc-server.c 2009-02-20 11:23:16.000000000 +0100
@@ -24,8 +24,8 @@ @@ -24,8 +24,8 @@
#include <zlib.h> #include <zlib.h>
#endif #endif
@ -175,10 +189,10 @@ diff -ur transmission-1.42.OLD/libtransmission/rpc-server.c transmission-1.42/li
#include "transmission.h" #include "transmission.h"
#include "bencode.h" #include "bencode.h"
diff -ur transmission-1.42.OLD/third-party/Makefile.in transmission-1.42/third-party/Makefile.in diff -r -u transmission-1.50.orig/third-party/Makefile.in transmission-1.50/third-party/Makefile.in
--- transmission-1.42.OLD/third-party/Makefile.in 2008-12-24 12:53:03.000000000 -0500 --- transmission-1.50.orig/third-party/Makefile.in 2009-02-13 17:43:48.000000000 +0100
+++ transmission-1.42/third-party/Makefile.in 2008-12-31 11:40:42.000000000 -0500 +++ transmission-1.50/third-party/Makefile.in 2009-02-20 11:23:36.000000000 +0100
@@ -254,7 +254,6 @@ @@ -253,7 +253,6 @@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
transmissionlocaledir = @transmissionlocaledir@ transmissionlocaledir = @transmissionlocaledir@
SUBDIRS = \ SUBDIRS = \

@ -1,7 +1,7 @@
Name: transmission Name: transmission
Version: 1.42 Version: 1.50
Release: 2%{?dist} Release: 1%{?dist}
Summary: A lightweight GTK+ BitTorrent client Summary: A lightweight GTK+ BitTorrent client
Group: Applications/Internet Group: Applications/Internet
@ -9,14 +9,14 @@ Group: Applications/Internet
License: MIT and GPLv2 License: MIT and GPLv2
URL: http://www.transmissionbt.com/ URL: http://www.transmissionbt.com/
Source0: http://download.m0k.org/transmission/files/transmission-%{version}.tar.bz2 Source0: http://download.m0k.org/transmission/files/transmission-%{version}.tar.bz2
Patch2: transmission-1.40-copt.patch Patch2: transmission-1.50-copt.patch
Patch3: transmission-1.42-libevent.patch Patch3: transmission-1.50-libevent.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: openssl-devel >= 0.9.4 BuildRequires: openssl-devel >= 0.9.4
BuildRequires: glib2-devel >= 2.15.5 BuildRequires: glib2-devel >= 2.15.5
BuildRequires: gtk2-devel >= 2.6.0 BuildRequires: gtk2-devel >= 2.6.0
BuildRequires: libnotify-devel >= 0.4.4 BuildRequires: libnotify-devel >= 0.4.3
BuildRequires: curl-devel >= 7.16.3 BuildRequires: curl-devel >= 7.16.3
BuildRequires: dbus-glib-devel >= 0.70 BuildRequires: dbus-glib-devel >= 0.70
BuildRequires: libevent-devel >= 1.4.5 BuildRequires: libevent-devel >= 1.4.5
@ -76,6 +76,10 @@ update-desktop-database > /dev/null 2>&1 || :
%changelog %changelog
* Fri Feb 20 2009 Denis Leroy <denis@poolshark.org> - 1.50-1
- Update to upstream 1.50
- Ported patches to 1.50, enforce compile flags
* Sun Jan 18 2009 Tomas Mraz <tmraz@redhat.com> - 1.42-2 * Sun Jan 18 2009 Tomas Mraz <tmraz@redhat.com> - 1.42-2
- rebuild with new openssl - rebuild with new openssl

Loading…
Cancel
Save