[rpms/transmission] epel10: - Minor change to patch to correct libnotify breakage

[rpms/transmission] epel10: - Minor change to patch to correct libnotify breakage

[Ankur Sinha]

A new commit has been pushed.

Repo   : rpms/transmission
Branch : epel10
Commit : f858a19c13b615219cda4530fb0dc6efd2012743
Author : Ankur Sinha <ankursinha@fedoraproject.org>
Date   : 2010-11-07T12:54:09+05:30
Stats  : +23/-2 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/transmission/c/f858a19c13b615219cda4530fb0dc6efd2012743?branch=epel10

Log:
- Minor change to patch to correct libnotify breakage

---
diff --git a/transmission-libnotify-change.patch b/transmission-libnotify-change.patch
index 9f50805..ae40c64 100644
--- a/transmission-libnotify-change.patch
+++ b/transmission-libnotify-change.patch
@@ -1,6 +1,6 @@
 diff -ur ../transmission-2.11.orig/gtk/notify.c ./gtk/notify.c
 --- ../transmission-2.11.orig/gtk/notify.c	2010-10-17 05:44:40.000000000 +0530
-+++ ./gtk/notify.c	2010-11-07 12:14:20.375068547 +0530
++++ ./gtk/notify.c	2010-11-07 12:36:51.666315486 +0530
 @@ -129,8 +129,12 @@
          NotifyNotification * n;
  
@@ -16,3 +16,18 @@ diff -ur ../transmission-2.11.orig/gtk/notify.c ./gtk/notify.c
          addIcon( n );
  
          if( can_support_actions( ) )
+@@ -156,7 +160,13 @@
+     if( pref_flag_get( PREF_KEY_SHOW_DESKTOP_NOTIFICATION ) )
+     {
+         NotifyNotification * n = notify_notification_new(
+-            _( "Torrent Added" ), name, NULL, NULL );
++            _( "Torrent Added" ), name, NULL
++/* the fourth argument was removed in libnotify 0.7.0 */
++#if !defined(NOTIFY_VERSION_MINOR) || (NOTIFY_VERSION_MAJOR == 0 && NOTIFY_VERSION_MINOR < 7)
++                                                     , NULL
++#endif
++                );
++
+         addIcon( n );
+         notify_notification_set_timeout( n, NOTIFY_EXPIRES_DEFAULT );
+         notify_notification_show( n, NULL );

diff --git a/transmission.spec b/transmission.spec
index 48cda63..65b1c06 100644
--- a/transmission.spec
+++ b/transmission.spec
@@ -1,6 +1,6 @@
 Name:           transmission
 Version:        2.11
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A lightweight GTK+ BitTorrent client
 
 Group:          Applications/Internet
@@ -28,6 +28,7 @@ BuildRequires:  GConf2-devel
 BuildRequires:  qt4-devel
 # this modification applies to the Qt qtr.pro file
 Patch1:         fix-optflags.patch
+Patch2:         transmission-libnotify-change.patch
 Requires: transmission-cli
 Requires: transmission-gtk
 %description
@@ -93,6 +94,7 @@ exit 0
 %prep
 %setup -q 
 %patch1 -p1
+%patch2 -p2
 
 %build
 %configure --disable-static --with-gtk --without-wx --enable-libcanberra --enable-libnotify --enable-daemon
@@ -205,6 +207,10 @@ update-desktop-database > /dev/null 2>&1 || :
 %doc %{_mandir}/man1/transmission-qt.*
 
 %changelog
+* Sun Nov 07 2010 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 2.11-3
+- fix build errors
+- update patch to fix another libnotify breakage
+
 * Sun Nov 07 2010 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 2.11-2
 - added patch to fix breakage for libnotify API changes