[kreetingkard] F-19: kill vendorization of desktop file (fpc#247)

Mamoru Tasaka mtasaka at fedoraproject.org
Sat Feb 9 10:11:25 UTC 2013


commit 2aa5492af439428cbe26a4d918d8936225e2a831
Author: Mamoru Tasaka <tasaka1 at localhost.localdomain>
Date:   Sat Feb 9 19:11:19 2013 +0900

    F-19: kill vendorization of desktop file (fpc#247)

 kreetingkard.spec |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)
---
diff --git a/kreetingkard.spec b/kreetingkard.spec
index 61285e0..0b2c4d4 100644
--- a/kreetingkard.spec
+++ b/kreetingkard.spec
@@ -1,12 +1,12 @@
 %define		mainver		0.7.1
-%define		vendorrel	5
+%define		vendorrel	6
 %define		repoid		18105
 
 
 
 Name:		kreetingkard
 Version:	%{mainver}
-Release:	%{vendorrel}%{?dist}.1
+Release:	%{vendorrel}%{?dist}
 Summary:	Japanese greeting card writing software for KDE
 
 Group:		Applications/Productivity
@@ -60,7 +60,9 @@ done
 desktop-file-install \
 	--dir $RPM_BUILD_ROOT%{_datadir}/applications/ \
 	--add-category Office \
+%if 0%{?fedora} < 19
 	--vendor fedora \
+%endif
 	--delete-original \
 	$RPM_BUILD_ROOT%{_datadir}/applnk/Office/%{name}.desktop
 %{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/applnk/
@@ -115,12 +117,15 @@ exit 0
 %{_datadir}/icons/crystalsvg/??x??/*/*.png
 %{_datadir}/mimelnk/application/x-%{name}.desktop
 
-%{_datadir}/applications/fedora-%{name}.desktop
+%{_datadir}/applications/*%{name}.desktop
 %{_datadir}/icons/hicolor/??x??/apps/%{name}.png
 
 %{_defaultdocdir}/HTML/en/%{name}/
 
 %changelog
+* Sat Feb  9 2013 Mamoru TASAKA <mtasaka at fedoraproject.org> - 0.7.1-6
+- F-19: kill vendorization of desktop file (fpc#247)
+
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.1-5.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 


More information about the scm-commits mailing list