[claws-mail-plugins] 3.7.10-7 pull cvs version of fancy for newer webkit support (rhbz#743834) fix debuginfo (rhbz#742249

[Andreas Bierfert]

commit de2f936df79d8a72b0491e82106098c2f56898a8
Author: Andreas Bierfert <andreas.bierfert at lowlatency.de>
Date:   Thu Oct 6 21:37:07 2011 +0200

    3.7.10-7
    pull cvs version of fancy for newer webkit support (rhbz#743834)
    fix debuginfo (rhbz#742249)

 .gitignore              |    1 +
 claws-mail-plugins.spec |   39 +++++++++++++++++++++++++++++----------
 sources                 |    1 +
 3 files changed, 31 insertions(+), 10 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3857a34..f8881db 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ claws-mail-extra-plugins-3.7.6.tar.bz2
 /claws-mail-extra-plugins-3.7.9.tar.bz2
 /claws-mail-extra-plugins-3.7.10.tar.bz2
 /gdata-0.2cvs11.tar.bz2
+/fancy-0.9.14cvs1.tar.bz2
diff --git a/claws-mail-plugins.spec b/claws-mail-plugins.spec
index 5a627c9..987c7d6 100644
--- a/claws-mail-plugins.spec
+++ b/claws-mail-plugins.spec
@@ -7,7 +7,7 @@
 %global attremover      1.0.12
 %global bsfilter        1.0.6
 %global clamd           3.5.2
-%global fancy           0.9.14
+%global fancy           0.9.14cvs1
 %global fetchinfo       0.4.24
 %global gdata           0.2cvs11
 %global geolocation     0.0.6
@@ -24,7 +24,7 @@
 
 Name:           claws-mail-plugins
 Version:        3.7.10
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Additional plugins for claws-mail
 
 Group:          Applications/Internet
@@ -32,6 +32,7 @@ License:        GPLv2 and GPLv3+ and MIT
 URL:            http://claws-mail.org
 Source0:        http://downloads.sourceforge.net/sylpheed-claws/claws-mail-extra-plugins-%{version}.tar.bz2
 Source1:        gdata-0.2cvs11.tar.bz2
+Source2:        fancy-0.9.14cvs1.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch1:         claws-mail-plugins-geolocation-champlain-0.9.patch
@@ -383,10 +384,14 @@ pushd vcalendar-%{vcalendar}
 chmod 0644 COPYING README AUTHORS
 popd
 
-# extract cvs version of gdata
+# extract cvs version of gdata for newer libgdata support
 rm -fr gdata_plugin-0.2
 tar -xjvf %{SOURCE1}
 
+# extract cvs version of fancy for new webkit
+rm -fr fancy-0.9.14
+tar -xjvf %{SOURCE2}
+
 %build
 #acpi_notifier
 cd acpi_notifier-%{acpinotifier}
@@ -424,7 +429,9 @@ cd ../clamd-%{clamd}
 %{__make} %{?_smp_mflags}
 
 # fancy
-cd ../fancy-%{fancy}
+#cd ../fancy-%{fancy}
+cd ../fancy
+autoreconf -fi
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
@@ -498,9 +505,11 @@ cd ../spam_report-%{spamreport}
 %if !0%{?rhel}
 #tnef
 cd ../tnef_parse-%{tnef}
-CFLAGS="-I%{_includedir}/libytnef" \
+OLDCFLAGS="$CFLAGS"
+CFLAGS="$CFLAGS -I%{_includedir}/libytnef" \
     %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
+CFLAGS="$OLDCFLAGS"
 %endif
 
 #vcalendar
@@ -553,7 +562,8 @@ cd -
 %find_lang clamd
 
 #fancy
-cd fancy-%{fancy}
+#cd fancy-%{fancy}
+cd fancy
 %{__make} install DESTDIR=$RPM_BUILD_ROOT CLAWS_MAIL_PLUGINDIR=%{_libdir}/claws-mail/plugins/
 cd -
 %find_lang fancy
@@ -723,10 +733,14 @@ rm -rf $RPM_BUILD_ROOT
 
 %files fancy -f fancy.lang
 %defattr(-,root,root,-)
-%doc fancy-%{fancy}/COPYING
-%doc fancy-%{fancy}/AUTHORS
-%doc fancy-%{fancy}/README
-%doc fancy-%{fancy}/ChangeLog
+#%doc fancy-%{fancy}/COPYING
+#%doc fancy-%{fancy}/AUTHORS
+#%doc fancy-%{fancy}/README
+#%doc fancy-%{fancy}/ChangeLog
+%doc fancy/COPYING
+%doc fancy/AUTHORS
+%doc fancy/README
+%doc fancy/ChangeLog
 %{_libdir}/claws-mail/plugins/fancy*
 
 %files fetchinfo
@@ -844,6 +858,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/claws-mail/plugins/vcalendar/
 
 %changelog
+* Thu Oct 06 2011 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 3.7.10-7
+- pull cvs version of fancy for newer webkit support (rhbz#743834)
+- fix debuginfo (rhbz#742249)
+
 * Wed Sep 28 2011 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - 3.7.10-6
 - drop unneeded plugin requires
diff --git a/sources b/sources
index 15a9599..0e4f957 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
 fe782b2d4762c9727e22c1bb7979f7d6  claws-mail-extra-plugins-3.7.10.tar.bz2
 d3d794962ef3d259d3400db6f116dd17  gdata-0.2cvs11.tar.bz2
+ed7f91eff46cedcbb0307407912e8bfc  fancy-0.9.14cvs1.tar.bz2