[Thunar] Update to 1.3.1

[Kevin Fenzi]

commit 702bce39e05297420ddca81d6e326c7a65bce13e
Author: Kevin Fenzi <kevin at scrye.com>
Date:   Wed Apr 4 20:53:11 2012 -0600

    Update to 1.3.1

 .gitignore                     |    1 +
 Thunar-1.3.1-desktop-fix.patch |   10 ++++++++++
 Thunar.spec                    |   17 ++++++++---------
 sources                        |    2 +-
 4 files changed, 20 insertions(+), 10 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 12bd6d8..da895ae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ Thunar-1.0.2.tar.bz2
 /Thunar-1.2.0.tar.bz2
 /Thunar-1.2.1.tar.bz2
 /Thunar-1.3.0.tar.bz2
+/Thunar-1.3.1.tar.bz2
diff --git a/Thunar-1.3.1-desktop-fix.patch b/Thunar-1.3.1-desktop-fix.patch
new file mode 100644
index 0000000..6c48ec9
--- /dev/null
+++ b/Thunar-1.3.1-desktop-fix.patch
@@ -0,0 +1,10 @@
+diff -Nur Thunar-1.3.1.orig/thunar/thunar-settings.desktop.in Thunar-1.3.1/thunar/thunar-settings.desktop.in
+--- Thunar-1.3.1.orig/thunar/thunar-settings.desktop.in	2012-03-28 11:04:36.000000000 -0600
++++ Thunar-1.3.1/thunar/thunar-settings.desktop.in	2012-04-02 12:55:22.858619987 -0600
+@@ -6,5 +6,5 @@
+ Icon=file-manager
+ Terminal=false
+ Type=Application
+-Categories=XFCE;GTK;Settings;DesktopSettings;X-XFCE-SettingsDialog;X-XFCE-PersonalSettings;
++Categories=GTK;Settings;DesktopSettings;X-XFCE-SettingsDialog;X-XFCE-PersonalSettings;
+ StartupNotify=true
diff --git a/Thunar.spec b/Thunar.spec
index d2de00b..592378b 100644
--- a/Thunar.spec
+++ b/Thunar.spec
@@ -1,8 +1,8 @@
 %global minorversion 1.3
 
 Name:           Thunar
-Version:        1.3.0
-Release:        7%{?dist}
+Version:        1.3.1
+Release:        1%{?dist}
 Summary:        Thunar File Manager
 
 Group:          User Interface/Desktops
@@ -12,9 +12,7 @@ Source0:        http://archive.xfce.org/src/xfce/thunar/%{minorversion}/%{name}-
 Source1:        thunar-sendto-bluetooth.desktop
 Source2:        thunar-sendto-audacious-playlist.desktop
 Source3:        thunar-sendto-quodlibet-playlist.desktop
-# Format string flaw when copying / moving files with % in the name  - CVE-2011-1588
-# http://git.xfce.org/xfce/thunar/commit/?id=03dd312e157d4fa8a11d5fa402706ae5b05806fa
-Patch0:         Thunar-1.3.0-CVE-2011-1588.patch
+Patch1:         Thunar-1.3.1-desktop-fix.patch
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  exo-devel >= 0.5.1
@@ -67,12 +65,12 @@ libraries and header files for the Thunar file manager.
 %prep
 %setup -q
 
+%patch1 -p1
+
 # fix icon in thunar-sendto-email.desktop
 sed -i 's!internet-mail!mail-message-new!' \
         plugins/thunar-sendto-email/thunar-sendto-email.desktop.in.in
 
-%patch0 -p1 -b .CVE-2011-1588
-
 %build
 %configure --enable-dbus --enable-gtk-doc
 # Remove rpaths
@@ -180,7 +178,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_libdir}/thunarx-*/thunar*.so
 %dir %{_libdir}/Thunar/
 %{_libdir}/Thunar/ThunarBulkRename
-%{_libdir}/Thunar/ThunarHelp
 %{_libdir}/Thunar/thunar-sendto-email
 %dir %{_datadir}/Thunar/
 %dir %{_datadir}/Thunar/sendto/
@@ -197,7 +194,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %dir %{_sysconfdir}/xdg/Thunar
 %config(noreplace) %{_sysconfdir}/xdg/Thunar/uca.xml
 
-
 %files devel
 %defattr(-,root,root,-)
 %doc examples
@@ -208,6 +204,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Mon Apr 02 2012 Kevin Fenzi <kevin at scrye.com> - 1.3.1-1
+- Update to 1.3.1
+
 * Fri Feb 10 2012 Petr Pisar <ppisar at redhat.com> - 1.3.0-7
 - Rebuild against PCRE 8.30
 
diff --git a/sources b/sources
index 1068d67..6b10175 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ab6f728384c0d925b40afae2f41268f3  Thunar-1.3.0.tar.bz2
+be790d2725340eba4bad074cff0dc69b  Thunar-1.3.1.tar.bz2