[Thunar] Remove --vendor from desktop-file-install https://fedorahosted.org/fesco/ticket/1077
Toshio くらとみ
toshio at fedoraproject.org
Sat Feb 23 07:02:25 UTC 2013
commit ab66d96c1930302281339a97c6debb5b60c232cc
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date: Fri Feb 22 23:02:09 2013 -0800
Remove --vendor from desktop-file-install https://fedorahosted.org/fesco/ticket/1077
Thunar.spec | 25 ++++++++++++++++++++-----
1 files changed, 20 insertions(+), 5 deletions(-)
---
diff --git a/Thunar.spec b/Thunar.spec
index 162514d..3024936 100644
--- a/Thunar.spec
+++ b/Thunar.spec
@@ -2,7 +2,7 @@
Name: Thunar
Version: 1.6.2
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Thunar File Manager
Group: User Interface/Desktops
@@ -97,22 +97,34 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
%find_lang Thunar
-desktop-file-install --vendor fedora --delete-original \
+desktop-file-install --delete-original \
+%if (0%{?fedora} && 0%{?fedora} < 19) || (0%{?rhel} && 0%{?rhel} < 7)
+ --vendor fedora \
+%endif
--dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
${RPM_BUILD_ROOT}%{_datadir}/applications/thunar-settings.desktop
-desktop-file-install --vendor fedora --delete-original \
+desktop-file-install --delete-original \
+%if (0%{?fedora} && 0%{?fedora} < 19) || (0%{?rhel} && 0%{?rhel} < 7)
+ --vendor fedora \
+%endif
--dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
--delete-original \
${RPM_BUILD_ROOT}%{_datadir}/applications/Thunar-bulk-rename.desktop
-desktop-file-install --vendor fedora --delete-original \
+desktop-file-install --delete-original \
+%if (0%{?fedora} && 0%{?fedora} < 19) || (0%{?rhel} && 0%{?rhel} < 7)
+ --vendor fedora \
+%endif
--dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
--remove-mime-type x-directory/gnome-default-handler \
--remove-mime-type x-directory/normal \
${RPM_BUILD_ROOT}%{_datadir}/applications/Thunar-folder-handler.desktop
-desktop-file-install --vendor fedora --delete-original \
+desktop-file-install --delete-original \
+%if (0%{?fedora} && 0%{?fedora} < 19) || (0%{?rhel} && 0%{?rhel} < 7)
+ --vendor fedora \
+%endif
--dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
${RPM_BUILD_ROOT}%{_datadir}/applications/Thunar.desktop
@@ -196,6 +208,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
+* Fri Feb 22 2013 Toshio Kuratomi <toshio at fedoraproject.org> - 1.6.2-3
+- Remove --vendor from desktop-file-install https://fedorahosted.org/fesco/ticket/1077
+
* Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
More information about the scm-commits
mailing list