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

Toshio くらとみ toshio at fedoraproject.org
Wed Mar 6 22:37:24 UTC 2013


commit ca5ba8181fcf8f40a74e715aad774a4dec20628a
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Wed Mar 6 14:37:15 2013 -0800

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

 kphotobymail.spec |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)
---
diff --git a/kphotobymail.spec b/kphotobymail.spec
index aa79c58..6c54d1f 100644
--- a/kphotobymail.spec
+++ b/kphotobymail.spec
@@ -4,7 +4,7 @@
 
 Name:		kphotobymail
 Version: 	0.4.1
-Release:	12%{?dist}
+Release:	13%{?dist}
 Summary:	A PyKDE based application for uploading photos to flickr account
 Group:		Applications/Internet
 # No version specified.
@@ -35,7 +35,10 @@ CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
 rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 
-desktop-file-install --vendor fedora				\
+desktop-file-install \
+%if 0%{?fedora} && 0%{?fedora} < 19
+	--vendor fedora				\
+%endif
 	--dir ${RPM_BUILD_ROOT}%{_datadir}/applications		\
 	--add-category X-Fedora					\
 	--add-category Application				\
@@ -59,9 +62,16 @@ rm -rf $RPM_BUILD_ROOT
 #No need to keep the previous kphotobymail.data
 %config  /etc/kphotobymail.data
 %{_datadir}/pixmaps/kphotobymail.png
+%if 0%{?fedora} && 0%{?fedora} < 19
 %{_datadir}/applications/fedora-kphotobymail.desktop
+%else
+%{_datadir}/applications/kphotobymail.desktop
+%endif
 
 %changelog
+* Wed Mar  6 2013 Toshio Kuratomi <toshio at fedoraproject.org> - 0.4.1-13
+- 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.4.1-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 


More information about the scm-commits mailing list