commit c6c68c6c90b8ddc64ccf48aac0d2046cc63f6120
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date: Fri Feb 22 22:58:15 2013 -0800
Remove --vendor from desktop-file-install https://fedorahosted.org/fesco/ticket/1077
thunar-volman.spec | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
---
diff --git a/thunar-volman.spec b/thunar-volman.spec
index 669eaf4..f92b302 100644
--- a/thunar-volman.spec
+++ b/thunar-volman.spec
@@ -7,7 +7,7 @@
Name: thunar-volman
Version: 0.8.0
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Automatic management of removable drives and media for Thunar
Group: User Interface/Desktops
@@ -50,7 +50,10 @@ make %{?_smp_mflags}
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
%find_lang %{name}
-desktop-file-install --vendor fedora \
+desktop-file-install \
+%if (0%{?fedora} && 0%{?fedora} < 19) || (0%{?rhel} && 0%{?rhel} < 7)
+ --vendor fedora \
+%endif
--dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
--add-only-show-in=XFCE \
--delete-original \
@@ -82,10 +85,13 @@ rm -rf $RPM_BUILD_ROOT
%{_bindir}/thunar-volman
%{_bindir}/thunar-volman-settings
%{_datadir}/icons/*/*/*/*
-%{_datadir}/applications/fedora-thunar-volman-settings.desktop
+%{_datadir}/applications/*thunar-volman-settings.desktop
%changelog
+* Fri Feb 22 2013 Toshio Kuratomi <toshio at fedoraproject.org> - 0.8.0-4
+- Remove --vendor from desktop-file-install https://fedorahosted.org/fesco/ticket/1077
+
* Fri Feb 15 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild