rpms/transmission/F-10 transmission-1.51-copt.patch, NONE, 1.1 transmission-1.51-libevent.patch, NONE, 1.1 transmission-1.51-xdg-download-dir.patch, NONE, 1.1 .cvsignore, 1.25, 1.26 sources, 1.25, 1.26 transmission.spec, 1.29, 1.30 transmission-1.40-copt.patch, 1.1, NONE transmission-1.42-libevent.patch, 1.1, NONE

Denis Leroy denis at fedoraproject.org
Mon Apr 20 10:08:40 UTC 2009 

Author: denis

Update of /cvs/pkgs/rpms/transmission/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29275

Modified Files:
	.cvsignore sources transmission.spec 
Added Files:
	transmission-1.51-copt.patch transmission-1.51-libevent.patch 
	transmission-1.51-xdg-download-dir.patch 
Removed Files:
	transmission-1.40-copt.patch transmission-1.42-libevent.patch 
Log Message:
- Update to upstream 1.51 (fix for #493064)
- Updated patches
- Added icon cache scriplets (#487824)


transmission-1.51-copt.patch:

--- NEW FILE transmission-1.51-copt.patch ---
--- transmission-1.51/configure~	2009-02-27 17:48:09.000000000 +0100
+++ transmission-1.51/configure	2009-02-28 09:38:58.000000000 +0100
@@ -20147,10 +20147,6 @@
 
 if test 0 = "0"; then
   supported_build=yes
-  if test "x$GCC" = "xyes" ; then
-    CFLAGS="$CFLAGS -g -O3 -funroll-loops "
-    CXXFLAGS="$CXXFLAGS -g -O3 -funroll-loops "
-  fi
 
 cat >>confdefs.h <<\_ACEOF
 #define TR_STABLE_RELEASE 1
@@ -20158,10 +20154,6 @@
 
 else
   supported_build=no
-  if test "x$GCC" = "xyes" ; then
-    CFLAGS="$CFLAGS -g -O0"
-    CXXFLAGS="$CXXFLAGS -g -O0"
-  fi
   if test 0 = "X"; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -21543,10 +21535,6 @@
     ;;
 esac
 
-if test "x$GCC" = "xyes" ; then
-  CFLAGS="$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"
-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

transmission-1.51-libevent.patch:

--- NEW FILE transmission-1.51-libevent.patch ---
diff -r -u transmission-1.50.orig/cli/Makefile.in transmission-1.50/cli/Makefile.in
--- transmission-1.50.orig/cli/Makefile.in	2009-02-13 17:43:47.000000000 +0100
+++ transmission-1.50/cli/Makefile.in	2009-02-20 11:20:28.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 -r -u transmission-1.50.orig/configure transmission-1.50/configure
--- transmission-1.50.orig/configure	2009-02-13 17:43:45.000000000 +0100
+++ transmission-1.50/configure	2009-02-20 11:20:57.000000000 +0100
@@ -1053,7 +1053,6 @@
 LIBNOTIFY_LIBS
 DBUS_GLIB_CFLAGS
 DBUS_GLIB_LIBS'
-ac_subdirs_all='third-party/libevent'
 
 # Initialize some variables set by options.
 ac_init_help=
@@ -23905,16 +23904,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 -r -u transmission-1.50.orig/daemon/Makefile.in transmission-1.50/daemon/Makefile.in
--- transmission-1.50.orig/daemon/Makefile.in	2009-02-13 17:43:48.000000000 +0100
+++ transmission-1.50/daemon/Makefile.in	2009-02-20 11:29:43.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,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 \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1)
@@ -307,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) \
--- transmission-1.50.orig/gtk/Makefile.in	2009-02-13 17:43:48.000000000 +0100
+++ transmission-1.50/gtk/Makefile.in	2009-02-20 11:22:10.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 -r -u transmission-1.50.orig/gtk/util.c transmission-1.50/gtk/util.c
--- transmission-1.50.orig/gtk/util.c	2009-02-13 17:40:54.000000000 +0100
+++ transmission-1.50/gtk/util.c	2009-02-20 11:22:18.000000000 +0100
@@ -38,7 +38,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 -r -u transmission-1.50.orig/libtransmission/clients.c transmission-1.50/libtransmission/clients.c
--- transmission-1.50.orig/libtransmission/clients.c	2009-02-13 17:40:53.000000000 +0100
+++ transmission-1.50/libtransmission/clients.c	2009-02-20 11:22:34.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 -r -u transmission-1.50.orig/libtransmission/fdlimit.c transmission-1.50/libtransmission/fdlimit.c
--- transmission-1.50.orig/libtransmission/fdlimit.c	2009-02-13 17:40:53.000000000 +0100
+++ transmission-1.50/libtransmission/fdlimit.c	2009-02-20 11:28:30.000000000 +0100
@@ -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 \
 	$(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)
@@ -472,7 +471,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 -r -u transmission-1.50.orig/libtransmission/net.c transmission-1.50/libtransmission/net.c
--- transmission-1.50.orig/libtransmission/net.c	2009-02-13 17:40:53.000000000 +0100
+++ transmission-1.50/libtransmission/net.c	2009-02-20 11:28:24.000000000 +0100
@@ -39,7 +39,7 @@
  #include <fcntl.h>
 #endif
 
-#include <evutil.h>
+#include <event.h>
 
 #include "transmission.h"
 #include "fdlimit.h"
diff -r -u transmission-1.50.orig/libtransmission/rpc-server.c transmission-1.50/libtransmission/rpc-server.c
--- 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 @@
  #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 -r -u transmission-1.50.orig/third-party/Makefile.in transmission-1.50/third-party/Makefile.in
--- transmission-1.50.orig/third-party/Makefile.in	2009-02-13 17:43:48.000000000 +0100
+++ transmission-1.50/third-party/Makefile.in	2009-02-20 11:23:36.000000000 +0100
@@ -253,7 +253,6 @@
 top_srcdir = @top_srcdir@
 transmissionlocaledir = @transmissionlocaledir@
 SUBDIRS = \
-    libevent \
     libnatpmp \
     miniupnp
 
--- transmission-1.51/daemon/remote.c~	2009-02-27 17:46:36.000000000 +0100
+++ transmission-1.51/daemon/remote.c	2009-02-28 09:40:41.000000000 +0100
@@ -21,7 +21,7 @@
  #include <unistd.h> /* getcwd */
 #endif
 
-#include <libevent/event.h>
+#include <event.h>
 
 #define CURL_DISABLE_TYPECHECK /* otherwise -Wunreachable-code goes insane */
 #include <curl/curl.h>

transmission-1.51-xdg-download-dir.patch:

--- NEW FILE transmission-1.51-xdg-download-dir.patch ---
Use the XDG download directory for downloads instead of
made-up unusally nonesixtent ~/Downloads (fall back to it
in case there's no XDG user dir configuration).

Lubomir Rintel <lkundrak at v3.sk>

diff -up transmission-1.51/libtransmission/platform.c.xdg-download-dir transmission-1.51/libtransmission/platform.c
--- transmission-1.51/libtransmission/platform.c.xdg-download-dir	2009-03-28 12:30:43.817212449 +0100
+++ transmission-1.51/libtransmission/platform.c	2009-03-28 12:31:39.752214378 +0100
@@ -443,15 +443,124 @@ tr_getDefaultConfigDir( const char * app
     return s;
 }
 
+/* This was stolen from gthumb, though it probably originates from
+ * xdg-user-dirs's xdg-user-dir-lookup.c. See:
+ * http://www.redhat.com/archives/fedora-devel-list/2007-March/msg00677.html
+ */
 const char*
 tr_getDefaultDownloadDir( void )
 {
-    static char * s = NULL;
+    static char * user_dir = NULL;
+    char type[] = "DOWNLOAD";
+    FILE * file;
+    char * home_dir, * config_home, * config_file;
+    char buffer[512];
+    char * p, * d;
+    int len;
+    int relative;
+
+    if( user_dir != NULL )
+        return user_dir;
+
+    home_dir = getenv( "HOME" );
+    if( home_dir == NULL )
+        return strdup("/tmp" );
 
-    if( s == NULL )
-        s = tr_buildPath( getHomeDir( ), "Downloads", NULL );
+    config_home = getenv( "XDG_CONFIG_HOME" );
+    if( config_home == NULL || config_home[0] == 0 )
+    {
+        config_file = malloc( strlen( home_dir ) + strlen( "/.config/user-dirs.dirs" ) + 1 );
+        strcpy( config_file, home_dir );
+        strcat( config_file, "/.config/user-dirs.dirs" );
+    } 
+    else
+    {
+        config_file = malloc( strlen ( config_home ) + strlen( "/user-dirs.dirs" ) + 1 );
+        strcpy( config_file, config_home );
+        strcat( config_file, "/user-dirs.dirs" );
+    }
 
-    return s;
+    file = fopen( config_file, "r" );
+    free( config_file );
+    if( file == NULL )
+        goto error;
+
+    while( fgets( buffer, sizeof( buffer ), file ) )
+    {
+        /* Remove newline at end */
+        len = strlen( buffer );
+        if( len > 0 && buffer[len-1] == '\n' )
+        buffer[len-1] = 0;
+      
+        p = buffer;
+        while( *p == ' ' || *p == '\t' )
+            p++;
+      
+        if( strncmp( p, "XDG_", 4 ) != 0 )
+            continue;
+        p += 4;
+
+        if( strncmp(p, type, strlen (type )) != 0)
+            continue;
+        p += strlen( type );
+
+        if( strncmp(p, "_DIR", 4 ) != 0)
+            continue;
+        p += 4;
+
+        while( *p == ' ' || *p == '\t' )
+            p++;
+
+        if( *p != '=' )
+            continue;
+        p++;
+      
+        while( *p == ' ' || *p == '\t' )
+            p++;
+
+        if( *p != '"' )
+            continue;
+        p++;
+      
+        relative = 0;
+        if( strncmp(p, "$HOME/", 6 ) == 0)
+        {
+            p += 6;
+            relative = 1;
+        }
+        else
+            if( *p != '/' )
+                continue;
+      
+        if( relative )
+        {
+            user_dir = malloc( strlen ( home_dir ) + 1 + strlen ( p ) + 1 );
+            strcpy( user_dir, home_dir );
+            strcat( user_dir, "/" );
+        }
+        else
+        {
+            user_dir = malloc( strlen ( p ) + 1 );
+            *user_dir = 0;
+        }
+      
+        d = user_dir + strlen( user_dir );
+        while( *p && *p != '"' )
+        {
+            if( ( *p == '\\' ) && ( *( p + 1 ) != 0 ))
+                p++;
+            *d++ = *p++;
+        }
+        *d = 0;
+    }  
+    
+    fclose( file );
+
+error:
+    if( !user_dir )
+            user_dir = tr_buildPath(  getHomeDir(  ), "Downloads", NULL );
+
+    return user_dir;
 }
 
 /***


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/transmission/F-10/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	14 Jan 2009 10:58:10 -0000	1.25
+++ .cvsignore	20 Apr 2009 10:08:10 -0000	1.26
@@ -1 +1 @@
-transmission-1.42.tar.bz2
+transmission-1.51.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/transmission/F-10/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	14 Jan 2009 10:58:10 -0000	1.25
+++ sources	20 Apr 2009 10:08:10 -0000	1.26
@@ -1 +1 @@
-c083bdcb01426466e80ee339bccd9351  transmission-1.42.tar.bz2
+b93439fbd0040ad6eb448f70a48355f5  transmission-1.51.tar.bz2


Index: transmission.spec
===================================================================
RCS file: /cvs/pkgs/rpms/transmission/F-10/transmission.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- transmission.spec	14 Jan 2009 10:58:10 -0000	1.29
+++ transmission.spec	20 Apr 2009 10:08:10 -0000	1.30
@@ -1,6 +1,6 @@
 
 Name:           transmission
-Version:        1.42
+Version:        1.51
 Release:        1%{?dist}
 Summary:        A lightweight GTK+ BitTorrent client
 
@@ -9,14 +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.40-copt.patch
-Patch3:         transmission-1.42-libevent.patch
+Patch0:         transmission-1.51-xdg-download-dir.patch
+Patch2:         transmission-1.51-copt.patch
+Patch3:         transmission-1.51-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:  libnotify-devel >= 0.4.3
 BuildRequires:  curl-devel >= 7.16.3
 BuildRequires:  dbus-glib-devel >= 0.70
 BuildRequires:  libevent-devel >= 1.4.5
@@ -32,6 +33,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .xdg-download-dir
 %patch2 -p1 -b .copt
 %patch3 -p1 -b .libevent
 
@@ -57,10 +59,14 @@
 
 
 %post
+touch --no-create %{_datadir}/icons/hicolor || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 update-desktop-database > /dev/null 2>&1 || :
 
 
 %postun
+touch --no-create %{_datadir}/icons/hicolor || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 update-desktop-database > /dev/null 2>&1 || :
 
 
@@ -76,6 +82,11 @@
 
 
 %changelog
+* Mon Apr 20 2009 Denis <denis at poolshark.org> - 1.51-1
+- Update to upstream 1.51 (fix for #493064)
+- Updated patches
+- Added icon cache scriplets (#487824)
+
 * Wed Jan 14 2009 Denis Leroy <denis at poolshark.org> - 1.42-1
 - Update to upstream version 1.42
 - Updated libevent patch


--- transmission-1.40-copt.patch DELETED ---


--- transmission-1.42-libevent.patch DELETED ---

More information about the scm-commits mailing list