[orage] Update to 4.8.1 Remove libnotify patch (upstreamed) Fix menu entries and show them not only in Xfce

[Christoph Wickert]

commit 6bffce9a3c997debccc5297d37eb05ec99f69456
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date:   Sat Feb 26 11:20:31 2011 +0100

    Update to 4.8.1
    Remove libnotify patch (upstreamed)
    Fix menu entries and show them not only in Xfce

 .gitignore                     |    1 +
 orage-4.7.6.13-libnotify.patch |   17 -----------------
 orage.spec                     |   22 ++++++++++------------
 sources                        |    2 +-
 4 files changed, 12 insertions(+), 30 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 11e84ae..13757d7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ orage-4.6.1.tar.bz2
 /orage-4.7.5.tar.bz2
 /orage-493faff1dafe25a46b0c9090636a21674c1705dc.tar.bz2
 /orage-4.8.0.tar.bz2
+/orage-4.8.1.tar.bz2
diff --git a/orage.spec b/orage.spec
index 0e816ce..b815c68 100644
--- a/orage.spec
+++ b/orage.spec
@@ -1,15 +1,14 @@
 %global xfceversion 4.8
 
 Name:           orage
-Version:        4.8.0
-Release:        3%{?dist}
+Version:        4.8.1
+Release:        1%{?dist}
 Summary:        Time-managing application for Xfce4
 
 Group:          User Interface/Desktops
 License:        GPLv2+
 URL:            http://www.xfce.org/
 Source0:        http://archive.xfce.org/src/apps/%{name}/%{xfceversion}/%{name}-%{version}.tar.bz2
-Patch0:         orage-4.7.6.13-libnotify.patch
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libxfcegui4-devel 
 BuildRequires:  xfce4-panel-devel >= 4.6.0
@@ -34,9 +33,6 @@ using the Orage Clock plugin for the panel.
 
 %prep
 %setup -q
-%if 0%{?fedora} >= 15
-%patch0 -p1 -b .libnotify-0.7.0
-%endif
 
 
 %build
@@ -53,15 +49,12 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
 
 desktop-file-install --vendor fedora                            \
         --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
-        --add-category Office                                   \
-	--add-only-show-in=XFCE					\
         --delete-original                                       \
         ${RPM_BUILD_ROOT}%{_datadir}/applications/xfcalendar.desktop
 
 desktop-file-install                            \
         --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
-        --add-category Office                                   \
-	--add-only-show-in=XFCE					\
+        --remove-category Application                           \
         --delete-original                                       \
         ${RPM_BUILD_ROOT}%{_datadir}/applications/globaltime.desktop
 
@@ -86,17 +79,17 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc README ChangeLog COPYING AUTHORS
+%{_bindir}/globaltime
 %{_bindir}/orage
 %{_bindir}/tz_convert
 %{_datadir}/applications/fedora-xfcalendar.desktop
 %{_datadir}/applications/globaltime.desktop
 %{_datadir}/applications/xfce-xfcalendar-settings.desktop
-%{_datadir}/orage
+%{_datadir}/orage/
 %{_libexecdir}/xfce4/panel-plugins/xfce4-orageclock-plugin
 %{_datadir}/icons/hicolor/48x48/apps/xfcalendar.png
 %{_datadir}/icons/hicolor/scalable/apps/xfcalendar.svg
 %{_datadir}/xfce4/panel-plugins/xfce4-orageclock-plugin.desktop
-%{_bindir}/globaltime
 %{_datadir}/dbus-1/services/org.xfce.calendar.service
 %{_datadir}/dbus-1/services/org.xfce.orage.service
 %{_mandir}/man1/globaltime.1.*
@@ -104,6 +97,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_mandir}/man1/tz_convert.1.*
 
 %changelog
+* Sat Feb 26 2011 Christoph Wickert <cwickert at fedoraproject.org> - 4.8.1-1
+- Update to 4.8.1
+- Remove libnotify patch (upstreamed)
+- Fix menu entries and show them not only in Xfce
+
 * Thu Feb 17 2011 Christoph Wickert <cwickert at fedoraproject.org> - 4.8.0-3
 - Spec file clean-up
 - Update icon-cache scriptlets
diff --git a/sources b/sources
index 15a3efb..87ad734 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cc6770036ddc690c2a361079fdae5d22  orage-4.8.0.tar.bz2
+9c1139ce03e9f309240e712cf31b6a49  orage-4.8.1.tar.bz2