[orage] Update to 4.7.5.16

[Kevin Fenzi]

commit 95bfa51587c3e26ebd1f69526204fea4246bc272
Author: Kevin Fenzi <kevin at tummy.com>
Date:   Sat Aug 21 16:21:29 2010 -0600

    Update to 4.7.5.16

 .gitignore |    1 +
 orage.spec |   37 ++++++++++++++++++++++++-------------
 sources    |    2 +-
 3 files changed, 26 insertions(+), 14 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 612ca42..da44729 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 orage-4.6.1.tar.bz2
+/orage-4.7.5.tar.bz2
diff --git a/orage.spec b/orage.spec
index 11cb18b..0926ca6 100644
--- a/orage.spec
+++ b/orage.spec
@@ -1,22 +1,22 @@
 Summary: Time-managing application for Xfce4
 Name: orage
-Version: 4.6.1
-Release: 2%{?dist}
+Version: 4.7.5.16
+Release: 1%{?dist}
 License: GPLv2+
 URL: http://www.xfce.org/
-Source0: http://www.xfce.org/archive/xfce-%{version}/src/orage-%{version}.tar.bz2
-# Upstream bug: http://bugzilla.xfce.org/show_bug.cgi?id=6234
-Patch1: orage-4.6.1-dsofix.patch
+Source0: http://archive.xfce.org/src/apps/orage/4.7/orage-4.7.5.tar.bz2
 Group: User Interface/Desktops
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: libxfce4util-devel >= %{version}
-BuildRequires: libxfcegui4-devel >= %{version}
-BuildRequires: xfce4-panel-devel >= %{version}
+BuildRequires: libxfce4util-devel 
+BuildRequires: libxfcegui4-devel 
+BuildRequires: xfce4-panel-devel
 BuildRequires: startup-notification-devel
 BuildRequires: gettext intltool
 BuildRequires: desktop-file-utils
 BuildRequires: db4-devel
 BuildRequires: libnotify-devel
+BuildRequires: libical-devel
+BuildRequires: popt-devel
 Requires: dbus
 
 Provides: xfcalendar = %{version}-%{release}
@@ -32,10 +32,9 @@ using the Orage Clock plugin for the panel.
 %prep
 %setup -q
 
-%patch1 -p1 
-
 %build
-%configure --disable-static
+export CFLAGS="$CFLAGS -I/usr/include/libical"
+%configure --disable-static --enable-libical
 
 make %{?_smp_mflags}
 
@@ -51,6 +50,12 @@ desktop-file-install --vendor fedora                            \
         --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					\
+        --delete-original                                       \
+        ${RPM_BUILD_ROOT}%{_datadir}/applications/globaltime.desktop
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -66,20 +71,26 @@ touch --no-create %{_datadir}/icons/hicolor || :
 %defattr(-,root,root,-)
 %doc README ChangeLog COPYING AUTHORS
 %{_bindir}/orage
+%{_bindir}/tz_convert
 %{_datadir}/applications/fedora-xfcalendar.desktop
+%{_datadir}/applications/globaltime.desktop
 %{_datadir}/applications/xfce-xfcalendar-settings.desktop
 %{_datadir}/orage
-%{_libexecdir}/xfce4/panel-plugins/orageclock
+%{_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/orageclock.desktop
+%{_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.gz
 %{_mandir}/man1/orage.1.gz
+%{_mandir}/man1/tz_convert.1.gz
 
 %changelog
+* Sat Aug 14 2010 Kevin Fenzi <kevin at tummy.com> - 4.7.5.16-1
+- Update to 4.7.5.16
+
 * Sat Feb 13 2010 Kevin Fenzi <kevin at tummy.com> - 4.6.1-2
 - Add patch to fix DSO linking. Fixes bug 564740
 
diff --git a/sources b/sources
index f8c8d8c..7dd0023 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-24fa43dd86ec5af5a4766620fd972cf2  orage-4.6.1.tar.bz2
+00200f79c1282ff8f416b300a16f7f45  orage-4.7.5.tar.bz2