remove vendor tag from desktop file. https://fedorahosted.org/fpc/ticket/247

- clean up spec to follow current guidelines
- remove obsolete and unapplied boolean patch

abiword-2.6.0-boolean.patch

@@ -1,13 +0,0 @@
-diff -u -r abiword-2.6.0.orig/src/text/ptbl/xp/pd_Style.h abiword-2.6.0/src/text/ptbl/xp/pd_Style.h
---- abiword-2.6.0.orig/src/text/ptbl/xp/pd_Style.h	2008-03-18 23:16:20.000000000 +0100
-+++ abiword-2.6.0/src/text/ptbl/xp/pd_Style.h	2008-03-25 17:14:23.000000000 +0100
-@@ -23,6 +23,9 @@
- #ifndef PD_STYLE_H
- #define PD_STYLE_H
- 
-+#ifndef FALSE
-+#define FALSE 0
-+#endif /* FALSE */
- #include "ut_types.h"
- #include "pt_Types.h"
- #include "ut_xml.h"

abiword.spec

@@ -2,10 +2,10 @@
 %define minorversion 8
 %define microversion 6
 
-Summary: The AbiWord word processor
+Summary: Word processing program
 Name: abiword
 Version: %{majorversion}.%{minorversion}.%{microversion}
-Release: 20%{?dist}
+Release: 21%{?dist}
 Epoch: 1
 Group: Applications/Editors
 License: GPLv2+
@@ -27,7 +27,6 @@ Group: System Environment/Libraries
 Patch0: abiword-2.6.0-windowshelppaths.patch
 Patch1: abiword-2.8.3-desktop.patch
 Patch2: abiword-2.6.0-boolean.patch
-Patch3: abiword-plugins-2.6.0-boolean.patch
 Patch103: abiword-2.8.6-libwpd.patch
 Patch104: abiword-2.8.6-no-undefined.patch
 Patch105: abiword-2.8.6-glib-header-fix.patch
@@ -80,9 +79,6 @@ Includes and definitions for developing with libabiword.
 %patch105 -p1 -b .glibfix
 %patch106 -p1 -b .png15
 
-# patch abiword plugins
-#%patch3 -p1 -b .boolean
-
 # setup abiword documentation
 %setup -q -T -b 1 -n abiword-docs-%{version}
 %patch0 -p1 -b .windowshelppaths
@@ -103,7 +99,7 @@ ABI_DOC_PROG=$(pwd)/../%{name}-%{version}/src/abiword ./make-html.sh
 
 # install abiword
 cd $RPM_BUILD_DIR/abiword-%{version}
-%{__make} install DESTDIR=$RPM_BUILD_ROOT
+%make_install
 
 # install the documentation
 cd $RPM_BUILD_DIR/abiword-docs-%{version}
@@ -118,13 +114,10 @@ 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 --vendor fedora --add-category X-Fedora \
+desktop-file-install \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category X-Red-Hat-Extra --remove-category X-Red-Hat-Base \
   --add-category Applications --add-category Office \
   ./abiword.desktop
-# remove the original one (which has X-Red-Hat-Base)  (#107023)
-%{__rm} -f $RPM_BUILD_ROOT/%{_datadir}/applications/abiword.desktop
 
 %{__install} -p -m 0644 -D %{SOURCE11} $RPM_BUILD_ROOT%{_datadir}/mime-info/abiword.mime
 %{__install} -p -m 0644 -D %{SOURCE12} $RPM_BUILD_ROOT%{_datadir}/mime-info/abiword.keys
@@ -134,8 +127,6 @@ desktop-file-install --vendor fedora --add-category X-Fedora \
 %{__rm} -f $RPM_BUILD_ROOT/%{_libdir}/libabiword-%{majorversion}.%{minorversion}.la
 %{__rm} -f $RPM_BUILD_ROOT/%{_libdir}/%{name}-%{majorversion}.%{minorversion}/plugins/*.la
 
-%clean
-%{__rm} -rf $RPM_BUILD_ROOT
 
 %post
 update-mime-database %{_datadir}/mime > /dev/null 2>&1 || :
@@ -146,7 +137,6 @@ update-mime-database %{_datadir}/mime > /dev/null 2>&1 || :
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 %files
-%defattr(-,root,root)
 %{_bindir}/abiword
 %{_datadir}/applications/*
 %{_datadir}/mime-info/abiword.mime
@@ -171,6 +161,11 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 %{_libdir}/pkgconfig/%{name}-%{majorversion}.%{minorversion}.pc
 
 %changelog
+* 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
+- remove obsolete and unapplied boolean patch
+
 * Fri Jan 18 2013 Adam Tkac <atkac redhat com> - 1:2.8.6-20
 - rebuild due to "jpeg8-ABI" feature drop