[starplot] Remove --vendor from desktop-file-isntall on f19+ https://fedorahosted.org/fesco/ticket/1077
Toshio くらとみ
toshio at fedoraproject.org
Mon Feb 25 03:22:42 UTC 2013
commit 87d131e661eacc63dcd4bf69f4b27482591d09ab
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date: Sun Feb 24 19:22:34 2013 -0800
Remove --vendor from desktop-file-isntall on f19+ https://fedorahosted.org/fesco/ticket/1077
starplot.spec | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
---
diff --git a/starplot.spec b/starplot.spec
index 2b6b6ee..9a5755a 100644
--- a/starplot.spec
+++ b/starplot.spec
@@ -1,7 +1,7 @@
Summary: 3-dimensional perspective star map viewer
Name: starplot
Version: 0.95.5
-Release: 10%{?dist}
+Release: 11%{?dist}
License: GPLv2+
Group: Applications/Engineering
URL: http://starplot.org/
@@ -40,7 +40,10 @@ rm -rf $RPM_BUILD_ROOT
make install INSTALL="%{__install} -p" DESTDIR=$RPM_BUILD_ROOT
-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/%{name}.desktop
@@ -66,7 +69,7 @@ rm -rf $RPM_BUILD_ROOT
%{_bindir}/%{name}
%{_bindir}/starconvert
%{_bindir}/starpkg
-%{_datadir}/applications/fedora-%{name}.desktop
+%{_datadir}/applications/*%{name}.desktop
%{_datadir}/pixmaps/%{name}32x32.xpm
%{_mandir}/man1/%{name}.1.gz
%{_mandir}/man1/starconvert.1.gz
@@ -77,6 +80,9 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/%{name}/test.stars
%changelog
+* Sun Feb 24 2013 Toshio Kuratomi <toshio at fedoraproject.org> - 0.95.5-11
+- Remove --vendor from desktop-file-isntall on f19+ https://fedorahosted.org/fesco/ticket/1077
+
* Fri Feb 15 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.95.5-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
More information about the scm-commits
mailing list