rpms/notification-daemon/devel notification-daemon.spec, 1.28, 1.29 sexy.patch, 1.1, 1.2

[Adam Tkac]

Author: atkac

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

Modified Files:
	notification-daemon.spec sexy.patch 
Log Message:
- improve libsexy patch

Get rid of notification-daemon termination caused by undefined symbol:
/usr/libexec/notification-daemon: symbol lookup error: /usr/lib64/notification-daemon-1.0/engines/libstandard.so: undefined symbol: SEXY_URL_LABEL



Index: notification-daemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/notification-daemon/devel/notification-daemon.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- notification-daemon.spec	2 Jul 2009 04:32:00 -0000	1.28
+++ notification-daemon.spec	21 Jul 2009 10:06:58 -0000	1.29
@@ -7,7 +7,7 @@
 Summary: Desktop Notification Daemon
 Name: notification-daemon
 Version: 0.4.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 URL: http://www.galago-project.org/specs/notification/
 License: GPLv2+
 Group: System Environment/Libraries
@@ -107,6 +107,9 @@ gconftool-2 --makefile-install-rule \
 
 
 %changelog
+* Tue Jul 21 2009 Adam Tkac <atkac redhat com> - 0.4.0-4
+- improve libsexy patch
+
 * Thu Jul  2 2009 Matthias Clasen <mclasen at redhat.com> - 0.4.0-3
 - Drop libsexy dependency
 

sexy.patch:
 configure.ac                |    2 --
 src/themes/standard/theme.c |   17 ++++++++++++-----
 2 files changed, 12 insertions(+), 7 deletions(-)

Index: sexy.patch
===================================================================
RCS file: /cvs/pkgs/rpms/notification-daemon/devel/sexy.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sexy.patch	2 Jul 2009 04:32:00 -0000	1.1
+++ sexy.patch	21 Jul 2009 10:06:58 -0000	1.2
@@ -1,6 +1,7 @@
---- 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 @@
+diff -up notification-daemon-0.4.0/configure.ac.sexy notification-daemon-0.4.0/configure.ac
+--- notification-daemon-0.4.0/configure.ac.sexy	2008-11-20 11:46:52.000000000 +0100
++++ notification-daemon-0.4.0/configure.ac	2009-07-21 11:46:18.769094999 +0200
+@@ -75,14 +75,12 @@ AM_GLIB_GNU_GETTEXT
  
  REQ_GTK_VERSION=2.10.0
  REQ_GLIB_VERSION=$REQ_GTK_VERSION
@@ -15,8 +16,9 @@
  	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
+diff -up notification-daemon-0.4.0/src/themes/standard/theme.c.sexy notification-daemon-0.4.0/src/themes/standard/theme.c
+--- notification-daemon-0.4.0/src/themes/standard/theme.c.sexy	2008-11-20 10:38:01.000000000 +0100
++++ notification-daemon-0.4.0/src/themes/standard/theme.c	2009-07-21 11:59:09.869092990 +0200
 @@ -1,7 +1,6 @@
  #include "config.h"
  
@@ -25,7 +27,7 @@
  
  typedef void (*ActionInvokedCb)(GtkWindow *nw, const char *key);
  typedef void (*UrlClickedCb)(GtkWindow *nw, const char *url);
-@@ -563,6 +562,14 @@
+@@ -563,6 +562,14 @@ configure_event_cb(GtkWidget *nw,
  	return FALSE;
  }
  
@@ -40,7 +42,7 @@
  GtkWindow *
  create_notification(UrlClickedCb url_clicked)
  {
-@@ -722,12 +729,12 @@
+@@ -722,12 +729,12 @@ create_notification(UrlClickedCb url_cli
  	gtk_widget_show(vbox);
  	gtk_box_pack_start(GTK_BOX(windata->content_hbox), vbox, TRUE, TRUE, 0);
  
@@ -56,3 +58,12 @@
  
  	atkobj = gtk_widget_get_accessible(windata->body_label);
  	atk_object_set_description(atkobj, "Notification body text.");
+@@ -801,7 +808,7 @@ set_notification_text(GtkWindow *nw, con
+ 	gtk_label_set_markup(GTK_LABEL(windata->summary_label), str);
+ 	g_free(str);
+ 
+-	sexy_url_label_set_markup(SEXY_URL_LABEL(windata->body_label), body);
++	gtk_label_set_text(windata->body_label, body);
+ 
+ 	if (body == NULL || *body == '\0')
+ 		gtk_widget_hide(windata->body_label);