[thunar-volman] - Update to 0.5.3 (for Thunar 1.1.5 on Xfce 4.8 pre2)

[Christoph Wickert]

commit da19b29147fada57bc3e93d6ee9f04f38205093f
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date:   Sun Jan 9 00:16:50 2011 +0100

    - Update to 0.5.3 (for Thunar 1.1.5 on Xfce 4.8 pre2)

 .gitignore         |    1 +
 sources            |    2 +-
 thunar-volman.spec |   54 ++++++++++++++++++++++++++++-----------------------
 3 files changed, 32 insertions(+), 25 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0f3a340..9a898fe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 thunar-volman-0.3.80.tar.bz2
+/thunar-volman-0.5.3.tar.bz2
diff --git a/sources b/sources
index 060cb1c..df0fe68 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4fd81b62690797317ca649ab20609dae  thunar-volman-0.3.80.tar.bz2
+285c075da3e304bc38adcfbe89105fee  thunar-volman-0.5.3.tar.bz2
diff --git a/thunar-volman.spec b/thunar-volman.spec
index 8809d3d..e50a687 100644
--- a/thunar-volman.spec
+++ b/thunar-volman.spec
@@ -1,26 +1,28 @@
-%define thunarver 1.0.0
+%global thunarversion 1.1
+%global xfceversion 4.7
 
 Name:           thunar-volman
-Version:        0.3.80
-Release:        5%{?dist}
+Version:        0.5.3
+Release:        1%{?dist}
 Summary:        Automatic management of removable drives and media for the Thunar file manager
 
 Group:          User Interface/Desktops
 License:        GPLv2+
 URL:            http://goodies.xfce.org/projects/thunar-plugins/%{name}
-Source0:        http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.bz2
-Patch0:		thunar-volman-0.3.80-parole.patch
-# Sent upstream at http://bugzilla.xfce.org/show_bug.cgi?id=6786
-Patch1:         thunar-volman-0.3.80-icon-naming.patch
+Source0:        http://www.xfce.org/archive/src/apps/%{name}/0.5/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  Thunar-devel >= 0.5.1
-BuildRequires:  hal-devel >= 0.5.0
-BuildRequires:  dbus-glib-devel >= 0.34
+BuildRequires:  exo-devel >= 0.5.0
+BuildRequires:  xfconf >= %{xfceversion}
+BuildRequires:  libxfce4ui-devel >= %{xfceversion}
+#BuildRequires:  hal-devel >= 0.5.0
+#BuildRequires:  dbus-glib-devel >= 0.34
+BuildRequires:  libgudev1-devel >= 145
+BuildRequires:  libnotify-devel >= 0.4.0
 BuildRequires:  gettext
-BuildRequires:  perl(XML::Parser)
+BuildRequires:  intltool
 BuildRequires:  desktop-file-utils
-Requires:       Thunar >= %{thunarver}
+Requires:       Thunar >= %{thunarversion}
 
 %description
 The Thunar Volume Manager is an extension for the Thunar file manager, which 
@@ -32,8 +34,6 @@ and import the new pictures from the camera into your photo collection.
 
 %prep
 %setup -q
-%patch0 -p1 -b .parole
-%patch1 -p1 -b .icon-naming
 
 
 %build
@@ -43,14 +43,13 @@ make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
 %find_lang %{name}
-desktop-file-install --vendor fedora                            \
-        --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
-        --add-category=X-XfceSettingsDialog                     \
-        --add-only-show-in=XFCE                                 \
-        --delete-original                                       \
-        ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}-settings.desktop
+desktop-file-install --vendor fedora                        \
+    --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
+    --add-only-show-in=XFCE                                 \
+    --delete-original                                       \
+    ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}-settings.desktop
 
 
 %post
@@ -76,13 +75,20 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README THANKS
 %{_bindir}/thunar-volman
-%{_datadir}/icons/hicolor/48x48/apps/tvm-*.png
-%{_datadir}/icons/hicolor/scalable/apps/tvm-*.svg
-%{_libexecdir}/thunar-volman-settings
+%{_bindir}/thunar-volman-settings
+%{_datadir}/icons/*/*/*/*
 %{_datadir}/applications/fedora-thunar-volman-settings.desktop
 
 
 %changelog
+* Sun Dec 05 2010 Christoph Wickert <cwickert at fedoraproject.org> - 0.5.3-1
+- Update to 0.5.3 (for Thunar 1.1.5 on Xfce 4.8 pre2)
+
+* Mon Nov 06 2010 Christoph Wickert <cwickert at fedoraproject.org> - 0.5.2-1
+- Update to 0.5.2 (for Thunar 1.1.4 on Xfce 4.8 pre1)
+- BR libgudev1-devel
+- Fix for libnotify 0.7.0 (bugzilla.xfce.org #6916)
+
 * Sat Nov 06 2010 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.80-5
 - Fix missing icons (#650504)