[ristretto] Update to 0.0.93 (fixes #542141 and #679808) No longer require xfce4-doc Run update-desktop-database

Christoph Wickert cwickert at fedoraproject.org
Fri Mar 4 23:50:53 UTC 2011


commit b882e55bf948f86f15577b6a59b59bc5d7510094
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date:   Sat Mar 5 00:50:30 2011 +0100

    Update to 0.0.93 (fixes #542141 and #679808)
    No longer require xfce4-doc
    Run update-desktop-database in %post and %postun

 .gitignore     |    1 +
 ristretto.spec |   26 +++++++++++++++++---------
 sources        |    2 +-
 3 files changed, 19 insertions(+), 10 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 915562d..91bbfc0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 ristretto-0.0.91.tar.bz2
+/ristretto-0.0.93.tar.bz2
diff --git a/ristretto.spec b/ristretto.spec
index ad6762c..48a89ff 100644
--- a/ristretto.spec
+++ b/ristretto.spec
@@ -1,8 +1,10 @@
 %global majorversion 0.0
+%global xfceversion 4.7.0
+
 
 Name:           ristretto
-Version:        0.0.91
-Release:        2%{?dist}
+Version:        0.0.93
+Release:        1%{?dist}
 Summary:        Image-viewer for the Xfce desktop environment
 Summary(de):    Bildbetrachter für die Xfce Desktop-Umgebung
 
@@ -14,11 +16,11 @@ Patch0:         ristretto-0.0.91-dsofix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  Thunar-devel >= 0.4
-BuildRequires:  libxfcegui4-devel >= 4.6.0
-BuildRequires:  xfconf-devel >= 4.6.0
-BuildRequires:  libexif-devel >= 0.6.0, dbus-glib-devel >= 0.34
+BuildRequires:  libxfce4ui-devel >= %{xfceversion}
+BuildRequires:  xfconf-devel >= %{xfceversion}
+BuildRequires:  libexif-devel >= 0.6.0
+BuildRequires:  dbus-glib-devel >= 0.34
 BuildRequires:  desktop-file-utils, gettext, intltool
-Requires:       xfce4-doc
 
 
 %description
@@ -61,6 +63,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+update-desktop-database &> /dev/null || :
 
 
 %postun
@@ -68,6 +71,7 @@ if [ $1 -eq 0 ] ; then
     touch --no-create %{_datadir}/icons/hicolor &>/dev/null
     gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 fi
+update-desktop-database &> /dev/null || :
 
 
 %posttrans
@@ -79,12 +83,16 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %doc AUTHORS COPYING ChangeLog README
 %{_bindir}/%{name}
 %{_datadir}/applications/fedora-%{name}.desktop
-%{_docdir}/%{name}/html/C/index.html
-%{_datadir}/icons/hicolor/*/apps/%{name}.png
-%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
+%{_docdir}/%{name}/
+%{_datadir}/icons/hicolor/*/*/*
 
 
 %changelog
+* Thu Mar 03 2011 Christoph Wickert <cwickert at fedoraproject.org> - 0.0.93-1
+- Update to 0.0.93 (fixes #542141 and #679808)
+- No longer require xfce4-doc
+- Run update-desktop-database in %%post and %%postun
+
 * Wed Feb 09 2011 Christoph Wickert <cwickert at fedoraproject.org> - 0.0.91-2
 - BR xfconf-devel to fix build after Xfce 4.8 update
 
diff --git a/sources b/sources
index 026abf6..e02c232 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1df541b920f044ac9f3731b2a0fe02d1  ristretto-0.0.91.tar.bz2
+74dcdf0fcbf7039852b817732a91fb6c  ristretto-0.0.93.tar.bz2


More information about the scm-commits mailing list