From 5b3d7422cd8ab17691fbb443f3388d3886c44a9f Mon Sep 17 00:00:00 2001 From: Christoph Wickert Date: Nov 27 2010 16:13:17 +0000 Subject: - Update to 0.2.0 --- diff --git a/.gitignore b/.gitignore index d85194a..0e5c491 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ xfce4-notifyd-0.1.0.tar.bz2 +/xfce4-notifyd-0.2.0.tar.bz2 diff --git a/sources b/sources index 7c39773..875416d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -659ecaf37f0f7ee9e31f7b25f9813778 xfce4-notifyd-0.1.0.tar.bz2 +4b614f738e87a7b84c2de0bddf6721b8 xfce4-notifyd-0.2.0.tar.bz2 diff --git a/xfce4-notifyd-0.1.0-dbus-service-name.patch b/xfce4-notifyd-0.1.0-dbus-service-name.patch deleted file mode 100644 index 92de5a2..0000000 --- a/xfce4-notifyd-0.1.0-dbus-service-name.patch +++ /dev/null @@ -1,38 +0,0 @@ -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-0.1.0-send-second-arg-notification-closed.patch b/xfce4-notifyd-0.1.0-send-second-arg-notification-closed.patch deleted file mode 100644 index db76e7e..0000000 --- a/xfce4-notifyd-0.1.0-send-second-arg-notification-closed.patch +++ /dev/null @@ -1,43 +0,0 @@ - -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 - diff --git a/xfce4-notifyd-0.2.0-dbus-service-name.patch b/xfce4-notifyd-0.2.0-dbus-service-name.patch new file mode 100644 index 0000000..704a27c --- /dev/null +++ b/xfce4-notifyd-0.2.0-dbus-service-name.patch @@ -0,0 +1,38 @@ +diff -Nur xfce4-notifyd-0.2.0.orig/Makefile.am xfce4-notifyd-0.2.0/Makefile.am +--- xfce4-notifyd-0.2.0.orig/Makefile.am 2010-11-14 14:16:43.000000000 +0100 ++++ xfce4-notifyd-0.2.0/Makefile.am 2010-11-27 16:38:29.143014262 +0100 +@@ -66,7 +66,7 @@ + + + servicedir = $(datadir)/dbus-1/services +-service_in_files = xfce4-notifyd/org.freedesktop.Notifications.service.in ++service_in_files = xfce4-notifyd/org.xfce.Notifications.service.in + service_DATA = $(service_in_files:.service.in=.service) + + dist_service = \ +diff -Nur xfce4-notifyd-0.2.0.orig/Makefile.in xfce4-notifyd-0.2.0/Makefile.in +--- xfce4-notifyd-0.2.0.orig/Makefile.in 2010-11-27 13:46:43.000000000 +0100 ++++ xfce4-notifyd-0.2.0/Makefile.in 2010-11-27 16:38:21.512993641 +0100 +@@ -449,7 +449,7 @@ + $(common_ldadd) + + servicedir = $(datadir)/dbus-1/services +-service_in_files = xfce4-notifyd/org.freedesktop.Notifications.service.in ++service_in_files = xfce4-notifyd/org.xfce.Notifications.service.in + service_DATA = $(service_in_files:.service.in=.service) + dist_service = \ + $(service_in_files) \ +diff -Nur xfce4-notifyd-0.2.0.orig/xfce4-notifyd/org.freedesktop.Notifications.service.in xfce4-notifyd-0.2.0/xfce4-notifyd/org.freedesktop.Notifications.service.in +--- xfce4-notifyd-0.2.0.orig/xfce4-notifyd/org.freedesktop.Notifications.service.in 2010-11-17 23:02:24.000000000 +0100 ++++ xfce4-notifyd-0.2.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=@notifydir@/xfce4-notifyd +diff -Nur xfce4-notifyd-0.2.0.orig/xfce4-notifyd/org.xfce.Notifications.service.in xfce4-notifyd-0.2.0/xfce4-notifyd/org.xfce.Notifications.service.in +--- xfce4-notifyd-0.2.0.orig/xfce4-notifyd/org.xfce.Notifications.service.in 1970-01-01 01:00:00.000000000 +0100 ++++ xfce4-notifyd-0.2.0/xfce4-notifyd/org.xfce.Notifications.service.in 2010-11-27 16:39:49.143228336 +0100 +@@ -0,0 +1,3 @@ ++[D-BUS Service] ++Name=org.freedesktop.Notifications ++Exec=@notifydir@/xfce4-notifyd diff --git a/xfce4-notifyd.spec b/xfce4-notifyd.spec index 563a504..532c861 100644 --- a/xfce4-notifyd.spec +++ b/xfce4-notifyd.spec @@ -1,24 +1,24 @@ # Review: https://bugzilla.redhat.com/show_bug.cgi?id=499282 +%global minorversion 0.2 + Name: xfce4-notifyd -Version: 0.1.0 -Release: 3%{?dist} +Version: 0.2.0 +Release: 1%{?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 +URL: http://goodies.xfce.org/projects/applications/xfce4-notifyd +Source0: http://archive.xfce.org/src/apps/%{name}/%{minorversion}/%{name}-%{version}.tar.bz2 +Patch0: xfce4-notifyd-0.2.0-dbus-service-name.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: gtk2-devel >= 2.10.0 -BuildRequires: libxfcegui4-devel >= 4.5.90 +BuildRequires: gtk2-devel >= 2.14.0 +BuildRequires: libxfce4ui-devel >= 4.7.0 BuildRequires: xfconf-devel >= 4.5.90 BuildRequires: dbus-glib-devel >= 0.72 BuildRequires: libglade2-devel >= 2.6.0 -BuildRequires: libsexy-devel >= 0.1.6 BuildRequires: desktop-file-utils BuildRequires: intltool Requires: dbus @@ -41,7 +41,7 @@ Features: %prep %setup -q %patch0 -p1 -b .dbus-service-name -%patch1 -p1 -b .reason-arg + %build %configure @@ -81,19 +81,22 @@ rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-,root,root,-) -# FIXME: Tell author to include the correct COPYING file %doc AUTHORS ChangeLog COPYING NEWS README TODO %{_bindir}/xfce4-notifyd-config -%{_libexecdir}/xfce4-notifyd +%{_libdir}/xfce4/notifyd/xfce4-notifyd %{_datadir}/applications/xfce4-notifyd-config.desktop -%{_datadir}/dbus-1/services/xfce-org.freedesktop.Notifications.service +%{_datadir}/dbus-1/services/org.xfce.Notifications.service %{_datadir}/icons/hicolor/48x48/apps/xfce4-notifyd.png %{_datadir}/themes/Default/xfce-notify-4.0/ %{_datadir}/themes/Smoke/ %{_datadir}/themes/ZOMG-PONIES!/ +%{_mandir}/man1/xfce4-notifyd-config.1.* %changelog +* Sat Nov 27 2010 Christoph Wickert - 0.2.0 +- Update to 0.2.0 + * Mon Jul 27 2009 Fedora Release Engineering - 0.1.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild