[orage] Update to 4.8.3 Remove the icon hack, orage now ships it's own Drop obsolete BR on startup-notificat

[Christoph Wickert]

commit 78cc950a1bb320e4dad9d86de79efdca743d905f
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date:   Thu Jan 5 18:46:53 2012 +0100

    Update to 4.8.3
    Remove the icon hack, orage now ships it's own
    Drop obsolete BR on startup-notification-devel
    Add VCS key

 .gitignore |    1 +
 orage.spec |   39 +++++++++++++++++++++------------------
 sources    |    2 +-
 3 files changed, 23 insertions(+), 19 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 24c5c0f..a0d1cce 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ orage-4.6.1.tar.bz2
 /xfce4-clock.png
 /xfce4-clock.svg
 /orage-4.8.2.tar.bz2
+/orage-4.8.3.tar.bz2
diff --git a/orage.spec b/orage.spec
index 6b3d402..e73de8a 100644
--- a/orage.spec
+++ b/orage.spec
@@ -1,24 +1,23 @@
 %global xfceversion 4.8
 
 Name:           orage
-Version:        4.8.2
-Release:        3%{?dist}
+Version:        4.8.3
+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
+#VCS: git:git://git.xfce.org/apps/orage
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  libxfcegui4-devel 
-BuildRequires:  xfce4-panel-devel >= 4.6.0
-BuildRequires:  startup-notification-devel
+BuildRequires:  pkgconfig(libxfce4panel-1.0) >= 4.6.0
+BuildRequires:  pkgconfig(libnotify) >= 0.3.2
+BuildRequires:  pkgconfig(libical) >= 0.43
+BuildRequires:  pkgconfig(dbus-glib-1) >= 0.34
+BuildRequires:  popt-devel
 BuildRequires:  gettext intltool
 BuildRequires:  desktop-file-utils
-BuildRequires:  libnotify-devel
-BuildRequires:  libical-devel >= 0.43
-BuildRequires:  popt-devel
-BuildRequires:  dbus-glib-devel >= 0.34
 Requires:       dbus
 Requires:       xfce4-panel
 
@@ -34,8 +33,6 @@ using the Orage Clock plugin for the panel.
 
 %prep
 %setup -q
-# Fix menu icon for globaltime (#748234)
-sed -i 's|Icon=clock|Icon=xfce4-clock|g' globaltime/globaltime.desktop.in
 
 
 %build
@@ -46,24 +43,24 @@ make %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot} INSTALL='install -p'
 %find_lang %{name}
 
 desktop-file-install --vendor fedora                            \
-        --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
+        --dir %{buildroot}%{_datadir}/applications         \
         --delete-original                                       \
-        ${RPM_BUILD_ROOT}%{_datadir}/applications/xfcalendar.desktop
+        %{buildroot}%{_datadir}/applications/xfcalendar.desktop
 
 desktop-file-install                            \
-        --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
+        --dir %{buildroot}%{_datadir}/applications         \
         --remove-category Application                           \
         --delete-original                                       \
-        ${RPM_BUILD_ROOT}%{_datadir}/applications/globaltime.desktop
+        %{buildroot}%{_datadir}/applications/globaltime.desktop
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %post
@@ -99,6 +96,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_mandir}/man1/tz_convert.1.*
 
 %changelog
+* Thu Jan 05 2012 Christoph Wickert <cwickert at fedoraproject.org> - 4.8.3-1
+- Update to 4.8.3
+- Remove the icon hack, orage now ships it's own
+- Drop obsolete BR on startup-notification-devel
+- Add VCS key
+
 * Wed Oct 26 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.8.2-3
 - Rebuilt for glibc bug#747377
 
diff --git a/sources b/sources
index b582e1d..ffdd30e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-950397c716c31e1aa5db83d35ddf6047  orage-4.8.2.tar.bz2
+4eca5632cd6ba0274bb804ec3bf51c8a  orage-4.8.3.tar.bz2