[justmoon] Remove vendor prefix from desktop files in F19+ https://fedorahosted.org/fesco/ticket/1077
Toshio くらとみ
toshio at fedoraproject.org
Wed Mar 6 22:00:36 UTC 2013
commit c50be813640c1807f0ecbaf3377019ed2dd67a33
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date: Wed Mar 6 14:00:24 2013 -0800
Remove vendor prefix from desktop files in F19+ https://fedorahosted.org/fesco/ticket/1077
justmoon.spec | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 deletions(-)
---
diff --git a/justmoon.spec b/justmoon.spec
index 2b490b3..d6f9a05 100644
--- a/justmoon.spec
+++ b/justmoon.spec
@@ -4,7 +4,7 @@
Name: justmoon
Version: 0.3.3
-Release: 11%{?dist}
+Release: 12%{?dist}
Summary: Just Moon is lunar observing software for Linux
Group: Amusements/Graphics
@@ -90,11 +90,17 @@ make -C gmoon install INSTALLPREFIX=$RPM_BUILD_ROOT/%{_prefix}
%endif
install -p -m 0755 qmoon/qmoon $RPM_BUILD_ROOT/%{_bindir}
%if %with gtk
-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 \
%{SOURCE1}
%endif
-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 \
%{SOURCE2}
@@ -114,17 +120,28 @@ rm -rf $RPM_BUILD_ROOT
%files gtk
%defattr(-,root,root,-)
%{_bindir}/gmoon
+%if (0%{?fedora} && 0%{?fedora} < 19) || ( 0%{?rhel} && 0%{?rhel} < 7)
%{_datadir}/applications/fedora-justmoon-gmoon.desktop
+%else
+%{_datadir}/applications/justmoon-gmoon.desktop
+%endif
%endif
%files qt
%defattr(-,root,root,-)
%{_bindir}/qmoon
+%if (0%{?fedora} && 0%{?fedora} < 19) || ( 0%{?rhel} && 0%{?rhel} < 7)
%{_datadir}/applications/fedora-justmoon-qmoon.desktop
+%else
+%{_datadir}/applications/justmoon-qmoon.desktop
+%endif
%changelog
+* Wed Mar 6 2013 Toshio Kuratomi <toshio at fedoraproject.org> - 0.3.3-12
+- Remove vendor prefix from desktop files in F19+ https://fedorahosted.org/fesco/ticket/1077
+
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.3-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
More information about the scm-commits
mailing list