From d78bce512fed1536f1d191e45b15721f6b5fc399 Mon Sep 17 00:00:00 2001
From: Christoph Wickert <cwickert@fedoraproject.org>
Date: May 13 2009 23:53:23 +0000
Subject: - Patch to rename dbus-service file to avoid conflict with

    notification-daemon

---

diff --git a/xfce4-notifyd-0.1.0-dbus-service-name.patch b/xfce4-notifyd-0.1.0-dbus-service-name.patch
new file mode 100644
index 0000000..92de5a2
--- /dev/null
+++ b/xfce4-notifyd-0.1.0-dbus-service-name.patch
@@ -0,0 +1,38 @@
+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@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
diff --git a/xfce4-notifyd.spec b/xfce4-notifyd.spec
index cee56a8..86444e2 100644
--- a/xfce4-notifyd.spec
+++ b/xfce4-notifyd.spec
@@ -2,13 +2,14 @@
 
 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
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel >= 2.10.0
@@ -21,9 +22,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 +39,7 @@ Features:
 
 %prep
 %setup -q
-
+%patch0 -p1 -b .dbus-service-name
 
 %build
 %configure
@@ -85,7 +84,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 +92,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Feb 23 2009 Christoph Wickert <cwickert@fedoraproject.org> - 0.1.0-2
+- Patch to rename dbus-service file to avoid conflict with notification-daemon
+
 * Mon Feb 23 2009 Christoph Wickert <cwickert@fedoraproject.org> - 0.1.0-1
 - Initial Fedora Package