[jabbim] Remove vendor on F19+ https://fedorahosted.org/fesco/ticket/1077

Toshio くらとみ toshio at fedoraproject.org
Wed Mar 6 21:34:00 UTC 2013


commit 28991d13d0654d6a979a12431349928c5518ed1f
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Wed Mar 6 13:33:45 2013 -0800

    Remove vendor on F19+ https://fedorahosted.org/fesco/ticket/1077

 jabbim.spec |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)
---
diff --git a/jabbim.spec b/jabbim.spec
index 57c0fd4..72ee036 100644
--- a/jabbim.spec
+++ b/jabbim.spec
@@ -2,7 +2,7 @@
 %global	svndate	20100612
 Name:		jabbim
 Version:	0.5.1
-Release:	6.svn%{svndate}%{?dist}
+Release:	7.svn%{svndate}%{?dist}
 Summary:	Jabber client for mere mortals
 
 Group:		Applications/Internet
@@ -63,7 +63,10 @@ make PREFIX=%{_prefix}
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
 
-desktop-file-install --vendor fedora \
+desktop-file-install \
+%if 0%{?fedora} && 0%{?fedora} < 19
+	--vendor fedora \
+%endif
 	--dir %{buildroot}%{_datadir}/applications \
 	--delete-original \
 	%{buildroot}/%{_datadir}/applications/%{name}.desktop
@@ -87,7 +90,11 @@ fi
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING
 %{_bindir}/jabbim
+%if 0%{?fedora} && 0%{?fedora} < 19
 %{_datadir}/applications/fedora-jabbim.desktop
+%else
+%{_datadir}/applications/jabbim.desktop
+%endif
 %{_datadir}/icons/hicolor/*/apps/jabbim.png
 %{_datadir}/icons/hicolor/scalable/apps/jabbim.svg
 %{_datadir}/pixmaps/jabbim.png
@@ -96,6 +103,9 @@ fi
 
 
 %changelog
+* Wed Mar  6 2013 Toshio Kuratomi <toshio at fedoraproject.org> - 0.5.1-7.svn20100612
+- Remove vendor on F19+ https://fedorahosted.org/fesco/ticket/1077
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.1-6.svn20100612
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 


More information about the scm-commits mailing list