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

Mamoru Tasaka mtasaka at fedoraproject.org
Sat Feb 9 10:03:38 UTC 2013


commit 3aef3e0e6a695a59643bfe27dc18afb9ba13d9ce
Author: Mamoru Tasaka <tasaka1 at localhost.localdomain>
Date:   Sat Feb 9 19:02:49 2013 +0900

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

 kazehakase.spec |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)
---
diff --git a/kazehakase.spec b/kazehakase.spec
index 4b2f4d4..412705f 100644
--- a/kazehakase.spec
+++ b/kazehakase.spec
@@ -45,7 +45,7 @@
 # When changing release number, please make it sure that
 # the new EVR won't be higher than the one of higher branch!!
 #
-%define		fedorarel	12
+%define		fedorarel	13
 %define		_release	%{fedorarel}%{?usesvn:.svn%svnver}
 
 %if 0%{?fedora} < 1
@@ -62,7 +62,7 @@ Version:	0.5.8
 # When changing release number, please make it sure that
 # the new EVR won't be higher than the one of higher branch!!
 #
-Release:	%{_release}%{?dist}.1
+Release:	%{_release}%{?dist}
 Summary:	Kazehakase browser using Gecko rendering engine
 
 Group:		Applications/Internet
@@ -310,7 +310,9 @@ popd
 find $RPM_BUILD_ROOT%{_libdir}/%{name} -name \*.la | xargs %{__rm} -f
 
 desktop-file-install \
+%if 0%{?fedora} < 19
 	--vendor fedora \
+%endif
 	--remove-category Application \
 	--delete-original \
 	--dir $RPM_BUILD_ROOT%{_datadir}/applications \
@@ -349,7 +351,7 @@ desktop-file-install \
 %{_datadir}/%{name}/*.png
 %{_datadir}/%{name}/icons/
 %{_datadir}/pixmaps/%{name}*.png
-%{_datadir}/applications/fedora-%{name}.desktop
+%{_datadir}/applications/*%{name}.desktop
 
 %{_mandir}/man1/%{name}.1*
 
@@ -384,6 +386,9 @@ desktop-file-install \
 %endif
 
 %changelog
+* Sat Feb  9 2013 Mamoru TASAKA <mtasaka at fedoraproject.org> - 0.5.8-13.svn3873_trunk
+- F-19: kill vendorization of desktop file (fpc#247)
+
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.8-12.svn3873_trunk.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 


More information about the scm-commits mailing list