rpms/xfce4-notifyd/F-11 xfce4-notifyd-0.1.0-dbus-service-name.patch, NONE, 1.1 xfce4-notifyd-0.1.0-send-second-arg-notification-closed.patch, NONE, 1.1 xfce4-notifyd.spec, 1.1, 1.2
Christoph Wickert
cwickert at fedoraproject.org
Thu May 14 00:16:48 UTC 2009
Author: cwickert
Update of /cvs/pkgs/rpms/xfce4-notifyd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30147
Modified Files:
xfce4-notifyd.spec
Added Files:
xfce4-notifyd-0.1.0-dbus-service-name.patch
xfce4-notifyd-0.1.0-send-second-arg-notification-closed.patch
Log Message:
* Mon Feb 23 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.0-2
- Patch to rename dbus-service file to avoid conflict with notification-daemon
xfce4-notifyd-0.1.0-dbus-service-name.patch:
--- NEW FILE xfce4-notifyd-0.1.0-dbus-service-name.patch ---
diff -Nur xfce4-notifyd-0.1.0.orig/xfce4-notifyd/Makefile.am xfce4-notifyd-0.1.0/xfce4-notifyd/Makefile.am
--- xfce4-notifyd-0.1.0.orig/xfce4-notifyd/Makefile.am 2008-11-24 20:36:12.000000000 +0100
+++ xfce4-notifyd-0.1.0/xfce4-notifyd/Makefile.am 2009-05-14 01:38:31.000000000 +0200
@@ -32,7 +32,7 @@
servicedir = $(datadir)/dbus-1/services
-service_in_files = org.freedesktop.Notifications.service.in
+service_in_files = xfce-org.freedesktop.Notifications.service.in
service_DATA = $(service_in_files:.service.in=.service)
%.service: $(srcdir)/%.service.in Makefile
diff -Nur xfce4-notifyd-0.1.0.orig/xfce4-notifyd/Makefile.in xfce4-notifyd-0.1.0/xfce4-notifyd/Makefile.in
--- xfce4-notifyd-0.1.0.orig/xfce4-notifyd/Makefile.in 2008-11-24 20:36:20.000000000 +0100
+++ xfce4-notifyd-0.1.0/xfce4-notifyd/Makefile.in 2009-05-14 01:38:58.000000000 +0200
@@ -268,7 +268,7 @@
$(LIBSEXY_LIBS)
servicedir = $(datadir)/dbus-1/services
-service_in_files = org.freedesktop.Notifications.service.in
+service_in_files = xfce-org.freedesktop.Notifications.service.in
service_DATA = $(service_in_files:.service.in=.service)
@MAINTAINER_MODE_TRUE at BUILT_SOURCES = \
@MAINTAINER_MODE_TRUE@ notify-dbus.h \
diff -Nur xfce4-notifyd-0.1.0.orig/xfce4-notifyd/org.freedesktop.Notifications.service.in xfce4-notifyd-0.1.0/xfce4-notifyd/org.freedesktop.Notifications.service.in
--- xfce4-notifyd-0.1.0.orig/xfce4-notifyd/org.freedesktop.Notifications.service.in 2008-11-15 10:29:42.000000000 +0100
+++ xfce4-notifyd-0.1.0/xfce4-notifyd/org.freedesktop.Notifications.service.in 1970-01-01 01:00:00.000000000 +0100
@@ -1,3 +0,0 @@
-[D-BUS Service]
-Name=org.freedesktop.Notifications
-Exec=@libexecdir@/xfce4-notifyd
diff -Nur xfce4-notifyd-0.1.0.orig/xfce4-notifyd/xfce-org.freedesktop.Notifications.service.in xfce4-notifyd-0.1.0/xfce4-notifyd/xfce-org.freedesktop.Notifications.service.in
--- xfce4-notifyd-0.1.0.orig/xfce4-notifyd/xfce-org.freedesktop.Notifications.service.in 1970-01-01 01:00:00.000000000 +0100
+++ xfce4-notifyd-0.1.0/xfce4-notifyd/xfce-org.freedesktop.Notifications.service.in 2008-11-15 10:29:42.000000000 +0100
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=org.freedesktop.Notifications
+Exec=@libexecdir@/xfce4-notifyd
xfce4-notifyd-0.1.0-send-second-arg-notification-closed.patch:
--- NEW FILE xfce4-notifyd-0.1.0-send-second-arg-notification-closed.patch ---
Revert e5e86376c5824b74073ab1ab2a332ee9c3bb64fc
We want to send the reason as libnotify 0.4.5 does support the reason arg.
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
new file mode 100644
index 0000000..4afffb8
--- /dev/null
+++ b/po/POTFILES.skip
@@ -0,0 +1 @@
+.pc/01_send-second-arg-notification-closed.patch/xfce4-notifyd/xfce-notify-daemon.c
diff --git a/xfce4-notifyd/xfce-notify-daemon.c b/xfce4-notifyd/xfce-notify-daemon.c
index 9a14e30..cd71cbb 100644
--- a/xfce4-notifyd/xfce-notify-daemon.c
+++ b/xfce4-notifyd/xfce-notify-daemon.c
@@ -125,15 +125,10 @@
G_SIGNAL_RUN_LAST,
0,
NULL, NULL,
- g_cclosure_marshal_VOID__UINT,
- G_TYPE_NONE, 1,
- G_TYPE_UINT);
-#if 0 /* it seems libnotify doesn't support the close-reason arg */
xfce_notify_marshal_VOID__UINT_UINT,
G_TYPE_NONE, 2,
G_TYPE_UINT,
G_TYPE_UINT);
-#endif
signals[SIG_ACTION_INVOKED] = g_signal_new("action-invoked",
XFCE_TYPE_NOTIFY_DAEMON,
G_SIGNAL_RUN_LAST,
@@ -215,9 +210,7 @@
g_tree_remove(daemon->active_notifications, id_p);
g_signal_emit(G_OBJECT(daemon), signals[SIG_NOTIFICATION_CLOSED], 0,
- GPOINTER_TO_UINT(id_p));
- /* NOTE: libnotify doesn't support the close-reason argument to
- * the signal. not sure why. */
+ GPOINTER_TO_UINT(id_p), reason);
}
static void
Index: xfce4-notifyd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-notifyd/F-11/xfce4-notifyd.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xfce4-notifyd.spec 6 May 2009 23:48:01 -0000 1.1
+++ xfce4-notifyd.spec 14 May 2009 00:16:16 -0000 1.2
@@ -2,13 +2,15 @@
Name: xfce4-notifyd
Version: 0.1.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Simple notification daemon for Xfce
Group: User Interface/Desktops
License: GPLv2
URL: http://spuriousinterrupt.org/projects/xfce4-notifyd
Source0: http://spuriousinterrupt.org/files/xfce4-notifyd/xfce4-notifyd-%{version}.tar.bz2
+Patch0: xfce4-notifyd-0.1.0-dbus-service-name.patch
+Patch1: xfce4-notifyd-0.1.0-send-second-arg-notification-closed.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gtk2-devel >= 2.10.0
@@ -21,9 +23,7 @@ BuildRequires: desktop-file-utils
BuildRequires: intltool
Requires: dbus
Requires: hicolor-icon-theme
-# the package conflicts with Gnome's notification-daemon
-Conflicts: notification-daemon
-# but also provides
+# for compatibility this package provides
Provides: desktop-notification-daemon
# and obsoletes all notification-daemon-xfce releases
Obsoletes: notification-daemon-xfce <= 0.3.7
@@ -40,7 +40,8 @@ Features:
%prep
%setup -q
-
+%patch0 -p1 -b .dbus-service-name
+%patch1 -p1 -b .reason-arg
%build
%configure
@@ -85,7 +86,7 @@ rm -rf $RPM_BUILD_ROOT
%{_bindir}/xfce4-notifyd-config
%{_libexecdir}/xfce4-notifyd
%{_datadir}/applications/xfce4-notifyd-config.desktop
-%{_datadir}/dbus-1/services/org.freedesktop.Notifications.service
+%{_datadir}/dbus-1/services/xfce-org.freedesktop.Notifications.service
%{_datadir}/icons/hicolor/48x48/apps/xfce4-notifyd.png
%{_datadir}/themes/Default/xfce-notify-4.0/
%{_datadir}/themes/Smoke/
@@ -93,5 +94,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Mon Feb 23 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.0-2
+- Patch to rename dbus-service file to avoid conflict with notification-daemon
+- Add Debian's patch support the reason arg in libnotify 0.4.5
+
* Mon Feb 23 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.0-1
- Initial Fedora Package
More information about the fedora-extras-commits
mailing list