[Thunar] Show 'Send to' menu entries based on filetypes

Christoph Wickert cwickert at fedoraproject.org
Sat Oct 13 12:33:55 UTC 2012


commit b44252964822c108506416e12a90e34fb7b193ae
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date:   Sat Oct 13 14:33:49 2012 +0200

    Show 'Send to' menu entries based on filetypes
    
    - Add blueman-sendto to the 'Sent to' menu

 Thunar.spec                                        |   31 +++++++++++---------
 ...etooth.desktop => thunar-sendto-blueman.desktop |    4 +-
 ...esktop => thunar-sendto-gnome-bluetooth.desktop |    0
 3 files changed, 19 insertions(+), 16 deletions(-)
---
diff --git a/Thunar.spec b/Thunar.spec
index e267f66..66951c4 100644
--- a/Thunar.spec
+++ b/Thunar.spec
@@ -10,9 +10,13 @@ License:        GPLv2+
 URL:            http://thunar.xfce.org/
 #VCS git:git://git.xfce.org/xfce/thunar
 Source0:        http://archive.xfce.org/src/xfce/thunar/%{minorversion}/%{name}-%{version}.tar.bz2
-Source1:        thunar-sendto-bluetooth.desktop
+Source1:        thunar-sendto-gnome-bluetooth.desktop
 Source2:        thunar-sendto-audacious-playlist.desktop
 Source3:        thunar-sendto-quodlibet-playlist.desktop
+Source4:        thunar-sendto-blueman.desktop
+# Upstream bug: https://bugzilla.xfce.org/show_bug.cgi?id=7392
+# Upstream fix: http://git.xfce.org/xfce/thunar/commit/?id=dfd51c7
+Patch0:         thunar-1.4.0-sendto-check-filetype.patch
 Patch1:         Thunar-1.3.1-desktop-fix.patch
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -65,7 +69,8 @@ libraries and header files for the Thunar file manager.
 %prep
 %setup -q
 
-%patch1 -p1
+%patch0 -p1 -b .check
+%patch1 -p1 -b .fix
 
 # fix icon in thunar-sendto-email.desktop
 sed -i 's!internet-mail!mail-message-new!' \
@@ -86,7 +91,7 @@ make %{?_smp_mflags} V=1
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
+make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} INSTALL='install -p'
 
 make -C examples distclean
 
@@ -119,17 +124,11 @@ desktop-file-install --vendor fedora --delete-original          \
         ${RPM_BUILD_ROOT}%{_datadir}/applications/Thunar.desktop
 
 # install additional sendto helpers
-desktop-file-install --vendor ""                                \
-        --dir ${RPM_BUILD_ROOT}%{_datadir}/Thunar/sendto        \
-        %{SOURCE1}
-
-desktop-file-install --vendor ""                                \
-        --dir ${RPM_BUILD_ROOT}%{_datadir}/Thunar/sendto        \
-        %{SOURCE2}
-
-desktop-file-install --vendor ""                                \
-        --dir ${RPM_BUILD_ROOT}%{_datadir}/Thunar/sendto        \
-        %{SOURCE3}
+for source in %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} ; do
+    desktop-file-install --vendor "" \
+            --dir ${RPM_BUILD_ROOT}%{_datadir}/Thunar/sendto \
+            $source
+done
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -204,6 +203,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Sat Oct 13 2012 Christoph Wickert <cwickert at fedoraproject.org> - 1.4.0-3
+- Show 'Send to' menu entries based on filetypes
+- Add blueman-sendto to the 'Sent to' menu
+
 * Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/thunar-sendto-bluetooth.desktop b/thunar-sendto-blueman.desktop
similarity index 85%
copy from thunar-sendto-bluetooth.desktop
copy to thunar-sendto-blueman.desktop
index 98899f6..90c1ee1 100644
--- a/thunar-sendto-bluetooth.desktop
+++ b/thunar-sendto-blueman.desktop
@@ -6,8 +6,8 @@ GenericName=Bluetooth Recipient
 GenericName[de]=Bluetooth Empfänger
 Comment=Send selected files via Bluetooth
 Comment[de]=Ausgewählte Dateien per Bluetooth senden
-Exec=bluetooth-sendto %F
-TryExec=bluetooth-sendto
+Exec=blueman-sendto %F
+TryExec=blueman-sendto
 Icon=bluetooth
 Terminal=false
 Type=Application
diff --git a/thunar-sendto-bluetooth.desktop b/thunar-sendto-gnome-bluetooth.desktop
similarity index 100%
rename from thunar-sendto-bluetooth.desktop
rename to thunar-sendto-gnome-bluetooth.desktop


More information about the scm-commits mailing list