[claws-mail] - 3.7.8-4 - remove icons fom /usr/share/pixmaps (#673235) - switch to upstream desktop file

[Andreas Bierfert]

commit bfa24595413e692f009033b921377652d81fa050
Author: Andreas Bierfert <andreas.bierfert at lowlatency.de>
Date:   Sun Jan 30 14:33:20 2011 +0100

    - 3.7.8-4
    - remove icons fom /usr/share/pixmaps (#673235)
    - switch to upstream desktop file

 claws-mail.desktop |    9 ---------
 claws-mail.spec    |   31 +++++++++++++++----------------
 2 files changed, 15 insertions(+), 25 deletions(-)
---
diff --git a/claws-mail.spec b/claws-mail.spec
index 6fb7a9f..d550f9e 100644
--- a/claws-mail.spec
+++ b/claws-mail.spec
@@ -1,12 +1,11 @@
 Name:           claws-mail
 Version:        3.7.8
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        The extended version of Sylpheed
 Group:          Applications/Internet
 License:        GPLv3+
 URL:            http://claws-mail.org
 Source0:        http://downloads.sourceforge.net/sylpheed-claws/%{name}-%{version}.tar.bz2
-Source1:        claws-mail.desktop
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:  flex, bison
@@ -148,11 +147,16 @@ export LIBTOOL=%{_bindir}/false
 
 %find_lang claws-mail
 
+# use provided desktop file
 desktop-file-install \
-        --vendor=fedora \
-        --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
-        --add-category=X-Fedora \
-	%{SOURCE1}
+--add-category="Office" \
+--remove-category="GTK" \
+--remove-key="Encoding" \
+--remove-key="Info" \
+--dir=%{buildroot}%{_datadir}/applications \
+%{name}.desktop
+
+desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
 
 %{__rm} -f ${RPM_BUILD_ROOT}%{_infodir}/dir
 %{__rm} -rf ${RPM_BUILD_ROOT}%{_datadir}/gnome
@@ -161,17 +165,9 @@ find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';'
 find ${RPM_BUILD_ROOT}/%{_libdir}/claws-mail/plugins/ -type f -name \
 "*.a" -exec rm -f {} ';'
 
-%{__mkdir_p} ${RPM_BUILD_ROOT}%{_datadir}/pixmaps
-
-%{__install} *.png \
-${RPM_BUILD_ROOT}%{_datadir}/pixmaps/
-
 # we include the manual in the doc section
 %{__rm} -rf ${RPM_BUILD_ROOT}%{_datadir}/doc/claws-mail
 
-# we have an desktop file already (#223436)
-%{__rm} -rf ${RPM_BUILD_ROOT}%{_datadir}/applications/claws-mail.desktop
-
 # Makefiles don't need to be in doc
 find manual -type f -name Makefile.am -exec rm {} \;
 find manual -type f -name Makefile.in -exec rm {} \;
@@ -199,8 +195,6 @@ touch -r NEWS ${RPM_BUILD_ROOT}%{_includedir}/%{name}/config.h
 %dir %{_libdir}/claws-mail
 %dir %{_libdir}/claws-mail/plugins
 %{_libdir}/claws-mail/plugins/trayicon.so
-%{_datadir}/pixmaps/*
-#%{_datadir}/claws-mail
 %{_mandir}/man1/*
 %{_datadir}/applications/*
 %{_datadir}/icons/*
@@ -235,6 +229,11 @@ touch -r NEWS ${RPM_BUILD_ROOT}%{_includedir}/%{name}/config.h
 %{_libdir}/claws-mail/plugins/smime.deps
 
 %changelog
+* Sun Jan 30 2011 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 3.7.8-4
+- remove icons fom /usr/share/pixmaps (#673235)
+- switch to upstream desktop file
+
 * Sun Jan 23 2011 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - 3.7.8-3
 - add plugin dep files to respective plugins (#667377)