[orage] Spec file clean-up Update icon-cache scriptlets No longer require db4-devel and xfce4-dev-tools

[Christoph Wickert]

commit b2f15997e8f45201d697eab5dddd434abb521f94
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date:   Thu Feb 17 20:47:20 2011 +0100

    Spec file clean-up
    Update icon-cache scriptlets
    No longer require db4-devel and xfce4-dev-tools

 orage.spec |   85 +++++++++++++++++++++++++++++++++++------------------------
 1 files changed, 50 insertions(+), 35 deletions(-)
---
diff --git a/orage.spec b/orage.spec
index 52cfa43..be01923 100644
--- a/orage.spec
+++ b/orage.spec
@@ -1,28 +1,29 @@
-Summary: Time-managing application for Xfce4
-Name: orage
-Version: 4.8.0
-Release: 2%{?dist}
-License: GPLv2+
-URL: http://www.xfce.org/
-Source0: http://archive.xfce.org/src/apps/orage/4.8/%{name}-%{version}.tar.bz2
-Patch0: orage-4.7.6.13-libnotify.patch
-Group: User Interface/Desktops
-Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-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
-BuildRequires: xfce4-dev-tools
-Requires: dbus
-
-Provides: xfcalendar = %{version}-%{release}
-Obsoletes: xfcalendar <= 4.2.3-3.fc6
+%global xfceversion 4.8
+
+Name:           orage
+Version:        4.8.0
+Release:        2%{?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
+BuildRequires:  startup-notification-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
+
+Provides:       xfcalendar = %{version}-%{release}
+Obsoletes:      xfcalendar <= 4.2.3-3.fc6
 
 %description
 Orage provides a calendar which integrates nicely into the Xfce Desktop 
@@ -33,7 +34,10 @@ using the Orage Clock plugin for the panel.
 
 %prep
 %setup -q
-%patch0 -p1 
+%if 0%{?fedora} >= 15
+%patch0 -p1 -b .libnotify-0.7.0
+%endif
+
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -I/usr/include/libical"
@@ -41,6 +45,7 @@ export CFLAGS="$RPM_OPT_FLAGS -I/usr/include/libical"
 
 make %{?_smp_mflags}
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
@@ -59,16 +64,24 @@ desktop-file-install                            \
 	--add-only-show-in=XFCE					\
         --delete-original                                       \
         ${RPM_BUILD_ROOT}%{_datadir}/applications/globaltime.desktop
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
+
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
@@ -86,13 +99,15 @@ touch --no-create %{_datadir}/icons/hicolor || :
 %{_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
+%{_mandir}/man1/globaltime.1.*
+%{_mandir}/man1/orage.1.*
+%{_mandir}/man1/tz_convert.1.*
 
 %changelog
-* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.8.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+* Thu Feb 17 2011 Christoph Wickert <cwickert at fedoraproject.org> - 4.8.0-2
+- Spec file clean-up
+- Update icon-cache scriptlets
+- No longer require db4-devel and xfce4-dev-tools
 
 * Tue Jan 13 2011 Kevin Fenzi <kevin at tummy.com> - 4.8.0-1
 - Update to 4.8.0