[xfce4-notifyd] Update to 0.2.2 Remove upstreamed Fix-race-with-window-becoming-invalid.patch

[Christoph Wickert]

commit e0a544ce745c31685cb81308f9078b7bf4697f2d
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date:   Tue Aug 9 16:55:51 2011 +0200

    Update to 0.2.2
    Remove upstreamed Fix-race-with-window-becoming-invalid.patch

 .gitignore                                         |    1 +
 sources                                            |    2 +-
 ... => xfce4-notifyd-0.2.2-dbus-service-name.patch |   10 +++++-----
 xfce4-notifyd.spec                                 |   17 +++++++++--------
 4 files changed, 16 insertions(+), 14 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0903547..c333b6a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 xfce4-notifyd-0.1.0.tar.bz2
 /xfce4-notifyd-0.2.0.tar.bz2
 /xfce4-notifyd-0.2.1.tar.bz2
+/xfce4-notifyd-0.2.2.tar.bz2
diff --git a/sources b/sources
index 8fe1e29..2e2318f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0a63857901809887b587c73024d1089b  xfce4-notifyd-0.2.1.tar.bz2
+8687fb7a0f270231ada265e363b6ffcc  xfce4-notifyd-0.2.2.tar.bz2
diff --git a/xfce4-notifyd-0.2.0-dbus-service-name.patch b/xfce4-notifyd-0.2.2-dbus-service-name.patch
similarity index 71%
rename from xfce4-notifyd-0.2.0-dbus-service-name.patch
rename to xfce4-notifyd-0.2.2-dbus-service-name.patch
index 704a27c..ad17c83 100644
--- a/xfce4-notifyd-0.2.0-dbus-service-name.patch
+++ b/xfce4-notifyd-0.2.2-dbus-service-name.patch
@@ -5,7 +5,7 @@ diff -Nur xfce4-notifyd-0.2.0.orig/Makefile.am xfce4-notifyd-0.2.0/Makefile.am
  
  
  servicedir = $(datadir)/dbus-1/services
--service_in_files = xfce4-notifyd/org.freedesktop.Notifications.service.in
+-service_in_files = xfce4-notifyd/org.xfce.xfce4-notifyd.Notifications.service.in
 +service_in_files = xfce4-notifyd/org.xfce.Notifications.service.in
  service_DATA = $(service_in_files:.service.in=.service)
  
@@ -17,14 +17,14 @@ diff -Nur xfce4-notifyd-0.2.0.orig/Makefile.in xfce4-notifyd-0.2.0/Makefile.in
  	$(common_ldadd) 
  
  servicedir = $(datadir)/dbus-1/services
--service_in_files = xfce4-notifyd/org.freedesktop.Notifications.service.in
+-service_in_files = xfce4-notifyd/org.xfce.xfce4-notifyd.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
+diff -Nur xfce4-notifyd-0.2.0.orig/xfce4-notifyd/org.xfce.xfce4-notifyd.Notifications.service.in xfce4-notifyd-0.2.0/xfce4-notifyd/org.xfce.xfce4-notifyd.Notifications.service.in
+--- xfce4-notifyd-0.2.0.orig/xfce4-notifyd/org.xfce.xfce4-notifyd.Notifications.service.in	2010-11-17 23:02:24.000000000 +0100
++++ xfce4-notifyd-0.2.0/xfce4-notifyd/org.xfce.xfce4-notifyd.Notifications.service.in	1970-01-01 01:00:00.000000000 +0100
 @@ -1,3 +0,0 @@
 -[D-BUS Service]
 -Name=org.freedesktop.Notifications
diff --git a/xfce4-notifyd.spec b/xfce4-notifyd.spec
index 7fabdb9..304a281 100644
--- a/xfce4-notifyd.spec
+++ b/xfce4-notifyd.spec
@@ -3,19 +3,17 @@
 %global minorversion 0.2
 
 Name:           xfce4-notifyd
-Version:        0.2.1
-Release:        3%{?dist}
+Version:        0.2.2
+Release:        1%{?dist}
 Summary:        Simple notification daemon for Xfce
 
 Group:          User Interface/Desktops
 License:        GPLv2
 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
-# Patch by Ricky Zhou taken from
-# https://bugzilla.xfce.org/show_bug.cgi?id=7643
-# applied in http://git.xfce.org/apps/xfce4-notifyd/commit/?id=37d571ae
-Patch1:         xfce4-notifyd-0.2.1-Fix-race-with-window-becoming-invalid.patch
+# Similar to https://bugzilla.xfce.org/show_bug.cgi?id=7335 but we did the same
+# two years before upstream and continue to use org.xfce.Notifications.service
+Patch0:         xfce4-notifyd-0.2.2-dbus-service-name.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel >= 2.14.0
@@ -44,7 +42,6 @@ Features:
 %prep
 %setup -q
 %patch0 -p1 -b .dbus-service-name
-%patch1 -p1 -b .invalid
 
 
 %build
@@ -97,6 +94,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Aug 09 2011 Christoph Wickert <cwickert at fedoraproject.org> - 0.2.2-1
+- Update to 0.2.2
+- Remove upstreamed Fix-race-with-window-becoming-invalid.patch
+
 * Fri Jul 31 2011 Christoph Wickert <cwickert at fedoraproject.org> - 0.2.1-3
 - Fix crash in handle_error. Thanks to Ricky Zhou (#706677)
 - Remove obsolete BuildRequires libglade2-devel