[claws-mail] 3.7.9-0.1.20110329cvs upgrade to cvs snapshot, drop cvs patches enhance desktop file to be option fo

[Andreas Bierfert]

commit 2485986fef340bb8017e01498efbc72e00b91c4c
Author: Andreas Bierfert <andreas.bierfert at lowlatency.de>
Date:   Tue Mar 29 20:54:30 2011 +0200

    3.7.9-0.1.20110329cvs
    upgrade to cvs snapshot, drop cvs patches
    enhance desktop file to be option for default mailer (#690298)
    cleanup spec file

 .gitignore                   |    2 +
 claws-mail-3.7.8-cvs14.patch |   42 -------------------------------
 claws-mail-3.7.8-nm09.patch  |   57 ------------------------------------------
 claws-mail.spec              |   55 ++++++++++++++++++++++------------------
 sources                      |    2 +-
 5 files changed, 33 insertions(+), 125 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 04f5a34..e71a0f6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 claws-mail-3.7.6.tar.bz2
 /claws-mail-3.7.8.tar.bz2
+/claws-mail-20110329cvs.tar.bz
+/claws-mail-20110329cvs.tar.bz2
diff --git a/claws-mail.spec b/claws-mail.spec
index e17b8ad..8f1bfda 100644
--- a/claws-mail.spec
+++ b/claws-mail.spec
@@ -1,16 +1,15 @@
+%global cvsdate 20110329
+
 Name:           claws-mail
-Version:        3.7.8
-Release:        7%{?dist}
+Version:        3.7.9
+Release:        0.1.%{cvsdate}%{?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
-# bugfixes
-# 661766 claws-mail-3.7.8cvs14
-Patch100:       %{name}-3.7.8-cvs14.patch
-Patch101:       %{name}-3.7.8-nm09.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
+# cvs -z3 -d:pserver:anonymous at claws-mail.org:/ co -r gtk2 claws
+Source0:        claws-mail-%{cvsdate}cvs.tar.bz2
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  flex, bison
 BuildRequires:  glib2-devel >= 2.6.2
 BuildRequires:  gtk2-devel >= 2.10.0
@@ -34,6 +33,8 @@ BuildRequires:  libtool
 BuildRequires:  libSM-devel
 BuildRequires:  NetworkManager-glib-devel dbus-glib-devel
 
+BuildRequires: autoconf automake
+
 # Dec 2006
 Obsoletes: sylpheed-claws <= 2.6.0
 Provides: sylpheed-claws = %{version}-%{release}
@@ -130,10 +131,8 @@ mails, verify signatures or sign and encrypt your own mails.
 
 
 %prep
-%setup -q
-
-%patch100 -p1 -b.cvs14
-%patch101 -p0 -b.nm09
+%setup -q -n claws
+./autogen.sh
 
 %build
 %configure --enable-ipv6 \
@@ -149,15 +148,15 @@ mails, verify signatures or sign and encrypt your own mails.
 %endif
            --enable-gnutls
 
-%{__make} %{?_smp_mflags} LIBTOOL=%{_bindir}/libtool
+make %{?_smp_mflags} LIBTOOL=%{_bindir}/libtool
 
-%{__make} check
+make check
 
 
 %install
-%{__rm} -rf ${RPM_BUILD_ROOT}
+rm -rf %{buildroot}
 export LIBTOOL=%{_bindir}/false
-%makeinstall gnomedatadir=${RPM_BUILD_ROOT}/%{_datadir}
+%makeinstall gnomedatadir=%{buildroot}%{_datadir}
 
 %find_lang claws-mail
 
@@ -172,15 +171,15 @@ desktop-file-install \
 
 desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
 
-%{__rm} -f ${RPM_BUILD_ROOT}%{_infodir}/dir
-%{__rm} -rf ${RPM_BUILD_ROOT}%{_datadir}/gnome
+rm -f %{buildroot}%{_infodir}/dir
+rm -rf %{buildroot}%{_datadir}/gnome
 
-find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';'
-find ${RPM_BUILD_ROOT}/%{_libdir}/claws-mail/plugins/ -type f -name \
+find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
+find %{buildroot}%{_libdir}/claws-mail/plugins/ -type f -name \
 "*.a" -exec rm -f {} ';'
 
 # we include the manual in the doc section
-%{__rm} -rf ${RPM_BUILD_ROOT}%{_datadir}/doc/claws-mail
+rm -rf %{buildroot}%{_datadir}/doc/claws-mail
 
 # Makefiles don't need to be in doc
 find manual -type f -name Makefile.am -exec rm {} \;
@@ -188,16 +187,16 @@ find manual -type f -name Makefile.in -exec rm {} \;
 find manual -type f -name Makefile -exec rm {} \;
 
 # fix pkconfig
-%{__perl} -i  -pe 's/\/local//g;' ${RPM_BUILD_ROOT}%{_libdir}/pkgconfig/claws-mail.pc
+perl -i  -pe 's/\/local//g;' %{buildroot}%{_libdir}/pkgconfig/claws-mail.pc
 
 # don't think we need icon-theme.cache
-%{__rm} -f ${RPM_BUILD_ROOT}%{_datadir}/icons/hicolor/icon-theme.cache
+rm -f %{buildroot}%{_datadir}/icons/hicolor/icon-theme.cache
 
 # set same date on config.h across builds for multilib (#340871)
-touch -r NEWS ${RPM_BUILD_ROOT}%{_includedir}/%{name}/config.h
+touch -r NEWS %{buildroot}%{_includedir}/%{name}/config.h
 
 %clean
-%{__rm} -rf ${RPM_BUILD_ROOT}
+rm -rf %{buildroot}
 
 %files -f claws-mail.lang
 %defattr(-,root,root,-)
@@ -243,6 +242,12 @@ touch -r NEWS ${RPM_BUILD_ROOT}%{_includedir}/%{name}/config.h
 %{_libdir}/claws-mail/plugins/smime.deps
 
 %changelog
+* Tue Mar 29 2011 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 3.7.9-0.1.20110329cvs
+- upgrade to cvs snapshot, drop cvs patches
+- enhance desktop file to be option for default mailer (#690298)
+- cleanup spec file
+
 * Sun Mar 27 2011 Christopher Aillon <caillon at redhat.com> - 3.7.8-7
 - Rebuild against NetworkManager 0.9
 
diff --git a/sources b/sources
index 74957ea..58e2393 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e8c516f67df195ee605ed5e5408b2a42  claws-mail-3.7.8.tar.bz2
+7ab5b2af10c46360ae417aabb17cc488  claws-mail-20110329cvs.tar.bz2