[tumbler] Update to 0.1.23

[Christoph Wickert]

commit 34738f26d083d38f6201a857874015b47c72a9e3
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date:   Thu Dec 8 00:54:10 2011 +0100

    Update to 0.1.23

 .gitignore   |    1 +
 sources      |    2 +-
 tumbler.spec |   47 +++++++++++++++++++++--------------------------
 3 files changed, 23 insertions(+), 27 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b6cec40..c0fb163 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ tumbler-0.1.2.tar.bz2
 /tumbler-0.1.20.tar.bz2
 /tumbler-0.1.21.tar.bz2
 /tumbler-0.1.22.tar.bz2
+/tumbler-0.1.23.tar.bz2
diff --git a/sources b/sources
index f140545..0b8bd45 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e7ba3b8f21f8f7e736f1e214906b4ca9  tumbler-0.1.22.tar.bz2
+c6cf6821f5d884cbf2c26f45f2fecc74  tumbler-0.1.23.tar.bz2
diff --git a/tumbler.spec b/tumbler.spec
index 80e6069..c755bb6 100644
--- a/tumbler.spec
+++ b/tumbler.spec
@@ -3,33 +3,27 @@
 %global minorversion 0.1
 
 Name:           tumbler
-Version:        0.1.22
-Release:        5%{?dist}
+Version:        0.1.23
+Release:        1%{?dist}
 Summary:        D-Bus service for applications to request thumbnails
 
 License:        GPLv2+ and LGPLv2+
 Group:          Applications/System
 URL:            http://git.xfce.org/xfce/tumbler/
 Source0:        http://archive.xfce.org/src/apps/tumbler/%{minorversion}/%{name}-%{version}.tar.bz2
-# https://bugzilla.redhat.com/show_bug.cgi?id=746110
-# reported upstream at https://bugzilla.xfce.org/show_bug.cgi?id=8040
-# patch taken from https://bugzilla.xfce.org/show_bug.cgi?id=7996
-# committed to trunk at http://git.xfce.org/xfce/tumbler/commit/?id=aab140d8
-Patch0:         tumbler-0.1.22-start-pipeline.patch
-# Fix ownership race conditions when started twice (two patches)
-# http://git.xfce.org/xfce/tumbler/commit/?id=77607001
-Patch1:         tumbler-0.1.22-fix-ownership-race-conditions.patch
-# http://git.xfce.org/xfce/tumbler/commit/?id=72525b63
-Patch2:         tumbler-0.1.22-simplify-the-race-fix.patch
 BuildRequires:  dbus-glib-devel
 BuildRequires:  freetype-devel
 BuildRequires:  gettext
-BuildRequires:  gstreamer-devel
 BuildRequires:  gtk2-devel
 BuildRequires:  intltool
 BuildRequires:  libpng-devel
 BuildRequires:  libjpeg-devel
 BuildRequires:  poppler-glib-devel
+# extra thumbnailers
+BuildRequires:  gstreamer-devel
+%{?fedora:BuildRequires: libgsf-devel}
+%{?fedora:BuildRequires: libopenraw-gnome-devel}
+
 
 %description
 Tumbler is a D-Bus service for applications to request thumbnails for various
@@ -37,21 +31,21 @@ URI schemes and MIME types. It is an implementation of the thumbnail
 management D-Bus specification described on
 http://live.gnome.org/ThumbnailerSpec written in an object-oriented fashion
 
+Additional thumbnailers can be found in the tumbler-extras package
+
+
 %package devel
 Summary:       Development files for %{name}
 Group:         Development/Libraries
-Requires:      %{name} = %{version}-%{release}
+Requires:      %{name}%{?_isa} = %{version}-%{release}
 
 %description devel
 This package contains libraries and header files for developing applications 
 that use %{name}.
 
-
 %prep
 %setup -q
-%patch0 -p1 -b .start-pipeline
-%patch1 -p1 -b .fix-ownership-race-conditions
-%patch2 -p1 -b .simplify-the-race-fix
+
 
 %build
 %configure --disable-static
@@ -86,19 +80,17 @@ rm -rf $RPM_BUILD_ROOT
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README TODO
-%{_datadir}/dbus-1/services/org.xfce.Tumbler.Cache1.service
-%{_datadir}/dbus-1/services/org.xfce.Tumbler.Manager1.service
-%{_datadir}/dbus-1/services/org.xfce.Tumbler.Thumbnailer1.service
-%{_libdir}/libtumbler-1.so.*
+%{_datadir}/dbus-1/services/org.xfce.Tumbler.*.service
+%{_libdir}/libtumbler-*.so.*
 
-%dir %{_libdir}/%{name}-1
-%{_libdir}/%{name}-1/tumblerd
-%{_libdir}/%{name}-1/plugins
+%dir %{_libdir}/%{name}-*
+%{_libdir}/%{name}-*/tumblerd
+%{_libdir}/tumbler-*/plugins/
 
 
 %files devel
 %defattr(-,root,root,-)
-%{_libdir}/libtumbler-1.so
+%{_libdir}/libtumbler-*.so
 %{_libdir}/pkgconfig/%{name}-1.pc
 
 %doc %{_datadir}/gtk-doc/
@@ -107,6 +99,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/%{name}-1/tumbler
 
 %changelog
+* Thu Dec 08 2011 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.23-1
+- Update to 0.1.23
+
 * Tue Dec 06 2011 Adam Jackson <ajax at redhat.com> - 0.1.22-5
 - Rebuild for new libpng