[picard] Remove vendor prefix from desktop files in F19+ https://fedorahosted.org/fesco/ticket/1077

Toshio くらとみ toshio at fedoraproject.org
Thu Mar 7 00:04:48 UTC 2013


commit ba283bd95d8eddd996cd5d6b62708b1d0c46f476
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Wed Mar 6 16:04:41 2013 -0800

    Remove vendor prefix from desktop files in F19+ https://fedorahosted.org/fesco/ticket/1077

 picard.spec |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)
---
diff --git a/picard.spec b/picard.spec
index 2492dec..60bf395 100644
--- a/picard.spec
+++ b/picard.spec
@@ -3,7 +3,7 @@
 
 Name:             picard
 Version:          1.1
-Release:          2%{?dist}
+Release:          3%{?dist}
 Summary:          MusicBrainz-based audio tagger
 Group:            Applications/Multimedia
 
@@ -68,7 +68,10 @@ rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install -O1 --skip-build --root=$RPM_BUILD_ROOT
 
 %find_lang %{name}
-desktop-file-install --vendor="fedora"                \
+desktop-file-install \
+%if 0%{?fedora} && 0%{?fedora} < 19
+  --vendor="fedora"                \
+%endif
   --delete-original --remove-category="Application"   \
   --dir=$RPM_BUILD_ROOT/%{_datadir}/applications      \
   $RPM_BUILD_ROOT/%{_datadir}/applications/*
@@ -117,13 +120,20 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc AUTHORS.txt COPYING.txt NEWS.txt INSTALL.txt
 %{_bindir}/picard
+%if 0%{?fedora} && 0%{?fedora} < 19
 %{_datadir}/applications/fedora-picard.desktop
+%else
+%{_datadir}/applications/picard.desktop
+%endif
 %{_datadir}/icons/hicolor/*/apps/picard.png
 %{python_sitearch}/*egg-info
 %dir %{python_sitearch}/picard
 %{python_sitearch}/picard/*
 
 %changelog
+* Wed Mar  6 2013 Toshio Kuratomi <toshio at fedoraproject.org> - 1.1-3
+- 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> - 1.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 


More information about the scm-commits mailing list