[isomaster] Remove --vendor from desktop-file-install for F19+. https://fedorahosted.org/fesco/ticket/1077
Toshio くらとみ
toshio at fedoraproject.org
Sun Feb 24 06:03:57 UTC 2013
commit c25a3a747f3f0a9299bd8035c3d3a9db7d521376
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date: Sat Feb 23 22:03:44 2013 -0800
Remove --vendor from desktop-file-install for F19+. https://fedorahosted.org/fesco/ticket/1077
isomaster.spec | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
---
diff --git a/isomaster.spec b/isomaster.spec
index b7d7eb2..ce45a3c 100644
--- a/isomaster.spec
+++ b/isomaster.spec
@@ -1,7 +1,7 @@
Name: isomaster
Summary: An easy to use GUI CD image editor
Version: 1.3.9
-Release: 3%{?dist}
+Release: 4%{?dist}
License: GPLv2
Group: Applications/File
URL: http://littlesvr.ca/isomaster/
@@ -43,7 +43,10 @@ cp text-editor.sh %{buildroot}%{_bindir}/text-editor.sh
%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 %{buildroot}%{_datadir}/applications \
--delete-original \
%{buildroot}%{_datadir}/applications/isomaster.desktop
@@ -65,10 +68,13 @@ update-desktop-database %{_datadir}/applications
%doc CHANGELOG.TXT CREDITS.TXT LICENCE.TXT README.TXT TODO.TXT
#workaround for a problem with bkisofs docs in a separate directory
%{_datadir}/doc/bkisofs/*.html
-%{_datadir}/applications/fedora-isomaster.desktop
+%{_datadir}/applications/*isomaster.desktop
%{_mandir}/man1/isomaster.1*
%changelog
+* Sat Feb 23 2013 Toshio Kuratomi <toshio at fedoraproject.org> - 1.3.9-4
+- Remove --vendor from desktop-file-install for F19+. https://fedorahosted.org/fesco/ticket/1077
+
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.9-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
More information about the scm-commits
mailing list