From 883c14bc93447f099df0750eb2d7d6edf10912f3 Mon Sep 17 00:00:00 2001
From: Christoph Wickert <cwickert@fedoraproject.org>
Date: Feb 17 2013 13:18:38 +0000
Subject: Make desktop file --vendor conditional


- Remove obsolete category 'Applications" from desktop file

---

diff --git a/abiword.spec b/abiword.spec
index 7636ff7..5f93aa7 100644
--- a/abiword.spec
+++ b/abiword.spec
@@ -5,7 +5,7 @@
 Summary: Word processing program
 Name: abiword
 Version: %{majorversion}.%{minorversion}.%{microversion}
-Release: 21%{?dist}
+Release: 22%{?dist}
 Epoch: 1
 Group: Applications/Editors
 License: GPLv2+
@@ -115,8 +115,11 @@ cp $RPM_BUILD_DIR/abiword-%{version}/abiword_48.png $RPM_BUILD_ROOT%{_datadir}/p
 cd $RPM_BUILD_DIR/abiword-%{version}
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install \
+%if (0%{?fedora} && 0%{?fedora} < 19) || (0%{?rhel} && 0%{?rhel} < 7)
+  --vendor fedora \
+%endif
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category Applications --add-category Office \
+  --add-category Office \
   ./abiword.desktop
 
 %{__install} -p -m 0644 -D %{SOURCE11} $RPM_BUILD_ROOT%{_datadir}/mime-info/abiword.mime
@@ -138,7 +141,7 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 %files
 %{_bindir}/abiword
-%{_datadir}/applications/*
+%{_datadir}/applications/*.desktop
 %{_datadir}/mime-info/abiword.mime
 %{_datadir}/mime-info/abiword.keys
 %{_datadir}/mime/packages/abiword.xml
@@ -161,6 +164,10 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 %{_libdir}/pkgconfig/%{name}-%{majorversion}.%{minorversion}.pc
 
 %changelog
+* Sun Feb 17 2013 Christoph Wickert <cwickert@fedoraproject.org> - 1:2.8.6-22
+- Make desktop file --vendor conditional
+- Remove obsolete category 'Applications" from desktop file
+
 * Sat Feb 09 2013 Rahul Sundaram <sundaram@fedoraproject.org> - 1:2.8.6-21
 - remove vendor tag from desktop file. https://fedorahosted.org/fpc/ticket/247
 - clean up spec to follow current guidelines