rpms/notification-daemon/devel sexy.patch, NONE, 1.1 notification-daemon.spec, 1.27, 1.28

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/notification-daemon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30275

Modified Files:
	notification-daemon.spec 
Added Files:
	sexy.patch 
Log Message:
drop libsexy dep


sexy.patch:

--- NEW FILE sexy.patch ---
--- notification-daemon-0.4.0/configure.ac	2008-11-20 05:46:52.000000000 -0500
+++ notification-daemon-0.4.0.sexy/configure.ac	2009-07-02 00:19:42.150024570 -0400
@@ -75,14 +75,12 @@
 
 REQ_GTK_VERSION=2.10.0
 REQ_GLIB_VERSION=$REQ_GTK_VERSION
-REQ_SEXY_VERSION=0.1.3
 REQ_DBUS_VERSION=0.36
 pkg_modules="
 	gtk+-2.0 >= $REQ_GTK_VERSION, \
 	glib-2.0 >= $REQ_GLIB_VERSION, \
 	dbus-1 >= $REQ_DBUS_VERSION, \
 	dbus-glib-1 >= $REQ_DBUS_VERSION, \
-	libsexy >= $REQ_SEXY_VERSION, \
 	gconf-2.0, \
 	libwnck-1.0 \
 "
--- notification-daemon-0.4.0/src/themes/standard/theme.c	2008-11-20 04:38:01.000000000 -0500
+++ notification-daemon-0.4.0.sexy/src/themes/standard/theme.c	2009-07-02 00:19:11.524018225 -0400
@@ -1,7 +1,6 @@
 #include "config.h"
 
 #include <gtk/gtk.h>
-#include <libsexy/sexy-url-label.h>
 
 typedef void (*ActionInvokedCb)(GtkWindow *nw, const char *key);
 typedef void (*UrlClickedCb)(GtkWindow *nw, const char *url);
@@ -563,6 +562,14 @@
 	return FALSE;
 }
 
+static gboolean
+activate_link (GtkLabel *label, const char *url, WindowData *windata)
+{
+	windata->url_clicked (windata->win, url);
+
+	return TRUE;
+}
+
 GtkWindow *
 create_notification(UrlClickedCb url_clicked)
 {
@@ -722,12 +729,12 @@
 	gtk_widget_show(vbox);
 	gtk_box_pack_start(GTK_BOX(windata->content_hbox), vbox, TRUE, TRUE, 0);
 
-	windata->body_label = sexy_url_label_new();
+	windata->body_label = gtk_label_new (NULL);
 	gtk_box_pack_start(GTK_BOX(vbox), windata->body_label, TRUE, TRUE, 0);
 	gtk_misc_set_alignment(GTK_MISC(windata->body_label), 0, 0);
 	gtk_label_set_line_wrap(GTK_LABEL(windata->body_label), TRUE);
-	g_signal_connect_swapped(G_OBJECT(windata->body_label), "url_activated",
-							 G_CALLBACK(windata->url_clicked), win);
+	g_signal_connect(G_OBJECT(windata->body_label), "activate-link",
+                                  G_CALLBACK(activate_link), windata);
 
 	atkobj = gtk_widget_get_accessible(windata->body_label);
 	atk_object_set_description(atkobj, "Notification body text.");


Index: notification-daemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/notification-daemon/devel/notification-daemon.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- notification-daemon.spec	26 Feb 2009 05:59:20 -0000	1.27
+++ notification-daemon.spec	2 Jul 2009 04:32:00 -0000	1.28
@@ -1,4 +1,4 @@
-%define gtk2_version		2.4.0
+%define gtk2_version		2.17.1
 %define dbus_version		0.90
 %define dbus_glib_version       0.70
 %define gconf_version           2.14
@@ -7,7 +7,7 @@
 Summary: Desktop Notification Daemon
 Name: notification-daemon
 Version: 0.4.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: http://www.galago-project.org/specs/notification/
 License: GPLv2+
 Group: System Environment/Libraries
@@ -19,7 +19,6 @@ BuildRequires: dbus-devel >= %{dbus_vers
 BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
 BuildRequires: libnotify-devel
 BuildRequires: libglade2-devel
-BuildRequires: libsexy-devel
 BuildRequires: GConf2-devel
 BuildRequires: autoconf automake
 BuildRequires: libwnck-devel >= %{wnck_version}
@@ -36,18 +35,22 @@ Obsoletes: notify-daemon
 
 Source0: http://www.galago-project.org/files/releases/source/notification-daemon/%{name}-%{version}.tar.bz2
 
+# drop libsexy dep
+Patch0: sexy.patch
+
 %description
 notification-daemon is the server implementation of the freedesktop.org desktop
-notification specification. Notifications can be used to inform the user 
-about an event or display some form of information without getting in the 
+notification specification. Notifications can be used to inform the user
+about an event or display some form of information without getting in the
 user's way.
 
 %prep
-%setup -q 
+%setup -q
+%patch0 -p1 -b .sexy
+
+autoreconf -i -f
 
 %build
-./autogen.sh
-intltoolize --force
 %configure --disable-static
 make
 
@@ -104,6 +107,9 @@ gconftool-2 --makefile-install-rule \
 
 
 %changelog
+* Thu Jul  2 2009 Matthias Clasen <mclasen at redhat.com> - 0.4.0-3
+- Drop libsexy dependency
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild