From: lisu <lisu@pld-linux.org>
Date: Thu, 7 Apr 2011 09:31:57 +0000 (+0000)
Subject: - fix build with libnotify 0.7
X-Git-Tag: auto/th/dhcpcd-ui-0_5_1-2~1
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fdhcpcd-ui.git;a=commitdiff_plain;h=15fbc490e8155972ceb2290d243869e4ee7a722c

- fix build with libnotify 0.7

Changed files:
    dhcpcd-ui-libnotify.patch -> 1.1
    dhcpcd-ui.spec -> 1.5
---

diff --git a/dhcpcd-ui-libnotify.patch b/dhcpcd-ui-libnotify.patch
new file mode 100644
index 0000000..10c7017
--- /dev/null
+++ b/dhcpcd-ui-libnotify.patch
@@ -0,0 +1,15 @@
+--- dhcpcd-ui-0.5.1/src/dhcpcd-gtk/main.c~	2010-06-09 15:55:38.000000000 +0200
++++ dhcpcd-ui-0.5.1/src/dhcpcd-gtk/main.c	2011-04-07 11:30:09.459298809 +0200
+@@ -198,7 +198,11 @@
+ 		nn = notify_notification_new_with_status_icon(title,
+ 		    msg, icon, status_icon);
+ 	else
+-		nn = notify_notification_new(title, msg, icon, NULL);
++		nn = notify_notification_new(title, msg, icon
++#if !defined(NOTIFY_VERSION_MINOR) || (NOTIFY_VERSION_MAJOR == 0 && NOTIFY_VERSION_MINOR < 7)
++				, NULL
++#endif
++				);
+ 	notify_notification_set_timeout(nn, 5000);
+ 	g_signal_connect(nn, "closed", G_CALLBACK(notify_closed), NULL);
+ 	notify_notification_show(nn, NULL);
diff --git a/dhcpcd-ui.spec b/dhcpcd-ui.spec
index fe6e4aa..c45f442 100644
--- a/dhcpcd-ui.spec
+++ b/dhcpcd-ui.spec
@@ -6,6 +6,7 @@ License:	BSD
 Group:		Libraries
 Source0:	http://roy.marples.name/downloads/dhcpcd/%{name}-%{version}.tar.bz2
 # Source0-md5:	a42b15650de093bcd3dd60fb94a483f7
+Patch0:		%{name}-libnotify.patch
 URL:		http://roy.marples.name/projects/dhcpcd-ui/wiki
 BuildRequires:	dbus-devel
 BuildRequires:	gtk+2-devel
@@ -29,6 +30,7 @@ You can click on one to configure the PSK or WEP key 0 for it.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure