[piklab] Remove vendor prefix from desktop files in F19+ https://fedorahosted.org/fesco/ticket/1077
Toshio くらとみ
toshio at fedoraproject.org
Thu Mar 7 00:12:52 UTC 2013
commit 89d1a5a01463b287659802a7dfff12500e6b4247
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date: Wed Mar 6 16:12:38 2013 -0800
Remove vendor prefix from desktop files in F19+ https://fedorahosted.org/fesco/ticket/1077
piklab.spec | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
---
diff --git a/piklab.spec b/piklab.spec
index 50071f8..9e9e242 100644
--- a/piklab.spec
+++ b/piklab.spec
@@ -2,7 +2,7 @@
Name: piklab
Version: 0.16.1
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Development environment for applications based on PIC & dsPIC microcontrollers
Summary(fr):IDE pour applications à base de microcontrôleurs PIC et de dsPIC
@@ -103,7 +103,10 @@ comment finir l'installation.
%{__rm} -rf %{buildroot}
%{__make} DESTDIR=%{buildroot} install
-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 \
--remove-category "Development" \
--remove-category "IDE" \
@@ -158,7 +161,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%defattr(-, root, root)
%doc Changelog COPYING README TODO README.Fedora LISEZMOI.Fedora
%{_bindir}/*
+%if (0%{?fedora} && 0%{?fedora} < 19) || ( 0%{?rhel} && 0%{?rhel} < 7)
%{_datadir}/applications/fedora-%{name}.desktop
+%else
+%{_datadir}/applications/%{name}.desktop
+%endif
%{_kde4_appsdir}/%{name}/
%{_kde4_appsdir}/katepart/syntax/*
%attr(644, -, -) %{_datadir}/mime/packages/*
@@ -171,6 +178,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%config(noreplace) %{_sysconfdir}/security/console.perms.d/*.perms
%changelog
+* Wed Mar 6 2013 Toshio Kuratomi <toshio at fedoraproject.org> - 0.16.1-4
+- 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.16.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
More information about the scm-commits
mailing list