rpms/mtr
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Remove --vendor flag from desktop-file-install https://fedorahosted.org/fesco/ticket/1077

Browse Source
This commit is contained in:
Toshio Kuratomi 2013-02-14 15:29:48 -08:00
parent 19d729c3ed
commit d05e1adc5a
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mtr.spec
View File

@ -1,7 +1,7 @@
Summary: A network diagnostic tool Summary: A network diagnostic tool
Name: mtr Name: mtr
Version: 0.82 Version: 0.82
Release: 4%{?dist} Release: 5%{?dist}
Epoch: 2 Epoch: 2
Group: Applications/Internet Group: Applications/Internet
License: GPLv2+ License: GPLv2+
@ -68,7 +68,10 @@ ln -fs consolehelper $RPM_BUILD_ROOT/%{_bindir}/xmtr
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications
desktop-file-install --vendor="fedora" \ desktop-file-install \
%if 0%{?fedora} && 0%{?fedora} < 19
--vendor="fedora" \
%endif
--dir=${RPM_BUILD_ROOT}/%{_datadir}/applications \ --dir=${RPM_BUILD_ROOT}/%{_datadir}/applications \
%{SOURCE3} %{SOURCE3}
@ -83,7 +86,11 @@ rm -rf $RPM_BUILD_ROOT
%files gtk %files gtk
%defattr(-,root,root,-) %defattr(-,root,root,-)
%if 0%{?fedora} && 0%{?fedora} < 19
%{_datadir}/applications/fedora-net-x%{name}.desktop %{_datadir}/applications/fedora-net-x%{name}.desktop
%else
%{_datadir}/applications/net-x%{name}.desktop
%endif
%attr(0755,root,root) %{_bindir}/xmtr.bin %attr(0755,root,root) %{_bindir}/xmtr.bin
%{_bindir}/xmtr %{_bindir}/xmtr
%config(noreplace) %{_sysconfdir}/pam.d/* %config(noreplace) %{_sysconfdir}/pam.d/*
@ -91,6 +98,9 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/pixmaps/mtr_icon.xpm %{_datadir}/pixmaps/mtr_icon.xpm
%changelog %changelog
* Thu Feb 14 2013 Toshio Kuratomi <toshio@fedoraproject.org> - 2:0.82-5
- Remove --vendor flag from desktop-file-install https://fedorahosted.org/fesco/ticket/1077
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2:0.82-4 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2:0.82-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild