[ristretto/el5/master] revert to 0.0.22 as initial version for el5

Christoph Wickert cwickert at fedoraproject.org
Mon Aug 2 22:42:23 UTC 2010


commit cd4a1db7f025d136506b83792b8653ed19d1bb5d
Author: Christoph Wickert <fedora at christoph-wickert.de>
Date:   Tue Aug 3 00:42:13 2010 +0200

    revert to 0.0.22 as initial version for el5

 .gitignore                    |    2 +-
 ristretto-0.0.91-dsofix.patch |   11 -----------
 ristretto.spec                |   20 ++++----------------
 sources                       |    2 +-
 4 files changed, 6 insertions(+), 29 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 915562d..53292f5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-ristretto-0.0.91.tar.bz2
+ristretto-0.0.22.tar.gz
diff --git a/ristretto.spec b/ristretto.spec
index bf8b145..037e4f5 100644
--- a/ristretto.spec
+++ b/ristretto.spec
@@ -1,22 +1,18 @@
-%global majorversion 0.0
-
 Name:           ristretto
-Version:        0.0.91
-Release:        1%{?dist}
+Version:        0.0.22
+Release:        2%{?dist}
 Summary:        Image-viewer for the Xfce desktop environment
 Summary(de):    Bildbetrachter für die Xfce Desktop-Umgebung
 
 Group:          User Interface/Desktops
 License:        GPLv2+
 URL:            http://goodies.xfce.org/projects/applications/ristretto/
-Source0:        http://archive.xfce.org/src/apps/%{name}/%{majorversion}/%{name}-%{version}.tar.bz2
-Patch0:         ristretto-0.0.91-dsofix.patch
+Source0:        http://goodies.xfce.org/releases/ristretto/ristretto-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  Thunar-devel >= 0.4, libxfcegui4-devel >= 4.4.0
 BuildRequires:  libexif-devel >= 0.6.0, dbus-glib-devel >= 0.34
 BuildRequires:  desktop-file-utils, gettext, intltool
-Requires:       xfce4-doc
 
 
 %description
@@ -30,7 +26,6 @@ Desktop-Umgebung.
 
 %prep
 %setup -q
-%patch0 -p1 -b .dsofix
 
 
 %build
@@ -44,6 +39,7 @@ make install DESTDIR=$RPM_BUILD_ROOT
 %find_lang %{name}
 desktop-file-install --vendor fedora                            \
         --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
+        --add-mime-type=image/tiff                              \
         --add-mime-type=image/x-bmp                             \
         --add-mime-type=image/x-png                             \
         --add-mime-type=image/x-pcx                             \
@@ -77,19 +73,11 @@ 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
 
 
 %changelog
-* Tue Jul 13 2010 Christoph Wickert <cwickert at fedoraproject.org> - 0.0.91-1
-- Update to 0.0.91 (Development release for next major version)
-- Require xfce4-doc for directory ownership of the nex docs
-
-* Wed Feb 17 2010 Christoph Wickert <cwickert at fedoraproject.org> - 0.0.22-3
-- Add patch to fix DSO linking (#565114)
-
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.0.22-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
diff --git a/sources b/sources
index 026abf6..a5a01c4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1df541b920f044ac9f3731b2a0fe02d1  ristretto-0.0.91.tar.bz2
+978ae19472c5a0b7d4b6622a68234a67  ristretto-0.0.22.tar.gz


More information about the scm-commits mailing list