[claws-mail-plugins] 3.7.10-10 don't build geolocation plugin since we can't mix gtk2 and gtk3 (#758173, #662800) remove
Michael Schwendt
mschwendt at fedoraproject.org
Wed Nov 30 21:40:59 UTC 2011
commit f8abfbdea41f8b4ceb3e3641fea0e8b1fff50fcf
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date: Wed Nov 30 22:40:54 2011 +0100
3.7.10-10
don't build geolocation plugin since we can't mix gtk2 and gtk3
(#758173, #662800)
remove libchamplain* pkg-config hacks for geolocation plugin
(it supports 0.4 to 0.8 only)
merge newer vcalendar plugin to fix a crash (#742249)
drop ancient Obsoletes/Provides
drop old spec sections not needed anymore
.gitignore | 1 +
claws-mail-plugins-gdata-0.9.0.patch | 131 ----------
claws-mail-plugins-geolocation-champlain-0.9.patch | 13 -
claws-mail-plugins.spec | 262 ++++++++------------
sources | 1 +
5 files changed, 108 insertions(+), 300 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f8881db..00dab0f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ claws-mail-extra-plugins-3.7.6.tar.bz2
/claws-mail-extra-plugins-3.7.10.tar.bz2
/gdata-0.2cvs11.tar.bz2
/fancy-0.9.14cvs1.tar.bz2
+/vcalendar-2.0.11cvs11.tar.gz
diff --git a/claws-mail-plugins.spec b/claws-mail-plugins.spec
index aff3ab0..f6f736a 100644
--- a/claws-mail-plugins.spec
+++ b/claws-mail-plugins.spec
@@ -1,4 +1,5 @@
%global pluginapi 3.7.10.0
+
# define plugin version
%global acpinotifier 1.0.25
%global addresskeeper 1.0.4
@@ -20,12 +21,12 @@
%global rssyl 0.31
%global spamreport 0.3.14
%global tnef 0.3.11
-%global vcalendar 2.0.11
+%global vcalendar 2.0.11cvs11
Name: claws-mail-plugins
Version: 3.7.10
-Release: 9%{?dist}
-Summary: Additional plugins for claws-mail
+Release: 10%{?dist}
+Summary: Additional plugins for Claws Mail
Group: Applications/Internet
License: GPLv2 and GPLv3+ and MIT
@@ -33,12 +34,10 @@ 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)
+Source3: vcalendar-2.0.11cvs11.tar.gz
Patch0: claws-mail-extra-plugins-3.7.10-glib2-include.patch
-Patch1: claws-mail-plugins-geolocation-champlain-0.9.patch
-
BuildRequires: claws-mail-devel >= %{version}
BuildRequires: glib2-devel
BuildRequires: gtk2-devel
@@ -101,7 +100,7 @@ Requires: %{name}-tnef = %{version}-%{release}
%endif
Requires: %{name}-vcalendar = %{version}-%{release}
-# and the ones from main claws-mail-package...
+# and the ones from main claws-mail package...
%if !0%{?rhel}
Requires: %{name}-dillo
%endif
@@ -110,27 +109,23 @@ Requires: %{name}-pgp
Requires: %{name}-bogofilter
Requires: %{name}-smime
-# Dec 2006
-Obsoletes: sylpheed-claws-plugins <= 2.6.0
-Provides: sylpheed-claws-plugins = %{version}-%{release}
%description
-Additional plugins for claws-mail
+Additional plugins for Claws Mail.
+
%package acpi-notifier
-Summary: ACPI notification plugin for claws-mail
+Summary: ACPI notification plugin for Claws Mail
Group: Applications/Internet
Requires: claws-mail(plugin-api)%{?_isa} = %pluginapi
-# Dec 2006
-Provides: sylpheed-claws-plugins-acpi-notifier = %{version}-%{release}
-Obsoletes: sylpheed-claws-plugins-acpi-notifier <= 2.6.0
%description acpi-notifier
Enables mail notification via LEDs on some laptops. Options can be found on
the 'Plugins/Acpi Notifier' page of the preferences.
+
%package address-keeper
-Summary: Never forget a typed address
+Summary: Never forget a typed address in Claws Mail
Group: Applications/Internet
Requires: claws-mail(plugin-api)%{?_isa} = %pluginapi
@@ -139,16 +134,18 @@ This plugin allows saving outgoing addresses to a designated folder
in the address book. Addresses are saved only if not found in the
address book to avoid unwanted duplicates.
+
%package archive
-Summary: Archiving features for claws-mail
+Summary: Archiving features for Claws Mail
Group: Applications/Internet
Requires: claws-mail(plugin-api)%{?_isa} = %pluginapi
%description archive
%{summary}
+
%package attachwarner
-Summary: Attachment warner plugin for claws-mail
+Summary: Attachment warner plugin for Claws Mail
Group: Applications/Internet
Requires: claws-mail(plugin-api)%{?_isa} = %pluginapi
@@ -158,31 +155,28 @@ body but without attaching any files to the message.
%package att-remover
-Summary: Attachments remover plugin for claws-mail
+Summary: Attachments remover plugin for Claws Mail
Group: Applications/Internet
Requires: claws-mail(plugin-api)%{?_isa} = %pluginapi
-# Dec 2006
-Provides: sylpheed-claws-plugins-att-remover = %{version}-%{release}
-Obsoletes: sylpheed-claws-plugins-att-remover <= 2.6.0
%description att-remover
Enables the removal of attachments from emails. When right-clicking a message,
choose 'Remove attachments' from the sub-menu.
+
%package bsfilter
-Summary: Bayesian spam filtering for claws-mail
+Summary: Bayesian spam filtering for Claws Mail
Group: Applications/Internet
Requires: claws-mail(plugin-api)%{?_isa} = %pluginapi
%description bsfilter
-Bayesian spam filtering for claws-mail using Bsfilter.
+Bayesian spam filtering for Claws Mail using Bsfilter.
+
%package clamd
-Summary: Use Clam AntiVirus to scan all messages
+Summary: Use Clam AntiVirus to scan messages in Claws Mail
Group: Applications/Internet
Requires: claws-mail(plugin-api)%{?_isa} = %pluginapi
-# was dropped as of 3.3.1 -> use this as 'successor'
-Provides: claws-mail-plugins-clamav = %{version}-%{release}
%description clamd
This plugin uses Clam AntiVirus to scan all messages that are
@@ -191,26 +185,26 @@ When a message attachment is found to contain a virus it can be
deleted or saved in a specially designated folder.
Options can be found in /Configuration/Preferences/Plugins/Clam AntiVirus.
+
%package fancy
-Summary: Render HTML emails via WebKit
+Summary: Display HTML emails in Claws Mail
Group: Applications/Internet
Requires: claws-mail(plugin-api)%{?_isa} = %pluginapi
%description fancy
This plugin renders HTML email via the GTK+ port of the WebKit library.
+
%package fetchinfo
-Summary: Inserts headers containing some download information
+Summary: Modify headers of downloaded messages in Claws Mail
Group: Applications/Internet
Requires: claws-mail(plugin-api)%{?_isa} = %pluginapi
-# Dec 2006
-Provides: sylpheed-claws-plugins-fetchinfo = %{version}-%{release}
-Obsoletes: sylpheed-claws-plugins-fetchinfo <= 2.6.0
%description fetchinfo
This plugin inserts headers containing some download information:
UIDL, Sylpheeds account name, POP server, user ID and retrieval time.
+
%if !0%{?rhel}
%package gdata
Summary: Access to GData (Google services) for Claws Mail
@@ -224,9 +218,10 @@ The only currently implemented feature is inclusion of
Google contacts into the address completion.
%endif
+
%if 0%{?fedora} >= 12
%package geolocation
-Summary: Provide GeoLocation functionality
+Summary: Provide GeoLocation functionality in Claws Mail
Group: Applications/Internet
Requires: claws-mail(plugin-api)%{?_isa} = %pluginapi
@@ -234,15 +229,12 @@ Requires: claws-mail(plugin-api)%{?_isa} = %pluginapi
This plugin provides GeoLocation functionality
%endif
+
%if 0%{?fedora} < 12
%package gtkhtml2-viewer
-Summary: GTK Html Viewer
+Summary: GTK Html Viewer for Claws Mail
Group: Applications/Internet
Requires: claws-mail(plugin-api)%{?_isa} = %pluginapi
-# Dec 2006
-Provides: sylpheed-claws-plugins-gtkhtml2-viewer = %{version}-%{release}
-Obsoletes: sylpheed-claws-plugins-gtkhtml2-viewer <= 2.6.0
-
%description gtkhtml2-viewer
Renders HTML mail using the gtkhtml2 rendering widget. The option, 'Do not load
@@ -250,89 +242,80 @@ remote links in mails' can be found on the 'Plugins/GtkHtml2 Viewer' page of
the preferences.
%endif
+
%package mailmbox
-Summary: Support for mailboxes in mbox format
+Summary: Add support for mailboxes in mbox format to Claws Mail
Group: Applications/Internet
Requires: claws-mail(plugin-api)%{?_isa} = %pluginapi
-# Dec 2006
-Provides: sylpheed-claws-plugins-mailmbox = %{version}-%{release}
-Obsoletes: sylpheed-claws-plugins-mailmbox <= 2.6.0
-
%description mailmbox
This plugin provides direct support for mailboxes in mbox format.
+
%package newmail
-Summary: Write a message header summary to a log file
+Summary: Make Claws Mail write a message header summary to a file
Group: Applications/Internet
Requires: claws-mail(plugin-api)%{?_isa} = %pluginapi
-# Dec 2006
-Provides: sylpheed-claws-plugins-newmail = %{version}-%{release}
-Obsoletes: sylpheed-claws-plugins-newmail <= 2.6.0
%description newmail
-Write a message header summary to a log file (defaults to ~/Mail/NewLog) an
+Write a message header summary to a log file (defaults to ~/Mail/NewLog) on
arrival of new mail *after* sorting.
+
%package notification
-Summary: New mail notifications
+Summary: Various ways to notify about new messages in Claws Mail
Group: Applications/Internet
Requires: claws-mail(plugin-api)%{?_isa} = %pluginapi
-# Dec 2006
-Provides: sylpheed-claws-plugins-notification = %{version}-%{release}
-Obsoletes: sylpheed-claws-plugins-notification <= 2.6.0
%description notification
This plugin collects various ways to notify the user of new (and possibly
unread) mail. Currently, a pop-up and a mail banner are implemented.
+
%package perl
-Summary: Extended filtering engine
+Summary: Perl based extended filtering engine for Claws Mail
Group: Applications/Internet
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
Requires: claws-mail(plugin-api)%{?_isa} = %pluginapi
-# Dec 2006
-Provides: sylpheed-claws-plugins-perl = %{version}-%{release}
-Obsoletes: sylpheed-claws-plugins-perl <= 2.6.0
%description perl
This plugin provides an extended filtering engine for the email client
-claws-mail. It allows for the use of full perl power in email filters.
+Claws Mail. It allows for the use of full perl power in email filters.
+
%package python
-Summary: Python scripting access to claws-mail
+Summary: Python scripting access to Claws Mail
Group: Applications/Internet
Requires: claws-mail(plugin-api)%{?_isa} = %pluginapi
%description python
This plugin offers a Python scripting access to Claws Mail. Python code can be
-entered interactively into an embedded Python console, or stored in scripts
+entered interactively into an embedded Python console or stored in scripts
under ~/.claws-mail/python-scripts. The scripts are then accessible via the
menu of the main window.
+
%package rssyl
-Summary: RSS plugin for claws-mail
+Summary: RSS plugin for Claws Mail
Group: Applications/Internet
Requires: claws-mail(plugin-api)%{?_isa} = %pluginapi
-# Dec 2006
-Provides: sylpheed-claws-plugins-rssyl = %{version}-%{release}
-Obsoletes: sylpheed-claws-plugins-rssyl <= 2.6.0
%description rssyl
-Allows you to read your favorite RSS news feeds in Claws. RSS 1.0,
+Allows you to read your favorite RSS news feeds in Claws Mail. RSS 1.0,
2.0 and Atom feeds are currently supported.
%package spam-report
-Summary: Report spam mail to various places
+Summary: Report spam mail to various places with Claws Mail
Group: Applications/Internet
Requires: claws-mail(plugin-api)%{?_isa} = %pluginapi
%description spam-report
-This plugin can report spam mails to various places.
+This plugin for Claws Mail can report spam mail to various places.
+
%if !0%{?rhel}
%package tnef
-Summary: Tnef message parsing
+Summary: TNEF message parsing for Claws Mail
Group: Applications/Internet
Requires: claws-mail(plugin-api)%{?_isa} = %pluginapi
@@ -340,19 +323,18 @@ Requires: claws-mail(plugin-api)%{?_isa} = %pluginapi
This plugin allows reading of application/ms-tnef attachments.
%endif
+
%package vcalendar
-Summary: Handling for vCalendar messages
+Summary: Handling of vCalendar messages in Claws Mail
Group: Applications/Internet
Requires: claws-mail(plugin-api)%{?_isa} = %pluginapi
-# Dec 2006
-Provides: sylpheed-claws-plugins-vcalendar = %{version}-%{release}
-Obsoletes: sylpheed-claws-plugins-vcalendar <= 2.6.0
%description vcalendar
This plugin enables vCalendar message handling like that produced by
Evolution or Outlook. It also supports subscribing to remote webCal feeds, and
exporting of your meetings or all your calendars.
+
%prep
%setup -q -n claws-mail-extra-plugins-%{version}
%patch0 -p1 -b .glib2-include
@@ -361,39 +343,25 @@ exporting of your meetings or all your calendars.
SOURCEAPI=$(grep -A 1 VERSION_NUMERIC %{_includedir}/claws-mail/common/version.h | tr -d '\n' | perl -ne 's/[\\\s]//g; m/(\d+),(\d+),(\d+),(\d+)/; print("$1.$2.$3.$4");')
[ "%pluginapi" == "$SOURCEAPI" ] || exit -1
-# hack - Fedora 14 has libchamplain-gtk >= 0.6 and wouldn't even build
-%if 0%{?fedora} == 14
-sed -i -e 's!champlain-gtk-0.4!champlain-gtk-0.6!g' geolocation_plugin-%{geolocation}/configure
-%endif
-
-%if 0%{?fedora} == 15
-sed -i -e 's!champlain-gtk-0.4!champlain-gtk-0.10!g' geolocation_plugin-%{geolocation}/configure
-sed -i -e 's!clutter-gtk-0.10!clutter-gtk-1.0!g' geolocation_plugin-%{geolocation}/configure
-pushd geolocation_plugin-%{geolocation}
-%patch1 -p2 -b .geolocation_champlain-0.10
-popd
-%endif
-
-%if 0%{?fedora} > 15
-sed -i -e 's!champlain-gtk-0.4!champlain-gtk-0.12!g' geolocation_plugin-%{geolocation}/configure
-sed -i -e 's!clutter-gtk-0.10!clutter-gtk-1.0!g' geolocation_plugin-%{geolocation}/configure
-pushd geolocation_plugin-%{geolocation}
-%patch1 -p2 -b .geolocation_champlain-0.10
-popd
-%endif
-
# fix perms
-pushd vcalendar-%{vcalendar}
+pushd vcalendar*
chmod 0644 COPYING README AUTHORS
popd
# extract cvs version of gdata for newer libgdata support
-rm -fr gdata_plugin-0.2
+rm -r gdata_plugin-0.2
tar -xjvf %{SOURCE1}
+mv gdata gdata_plugin-%{gdata}
# extract cvs version of fancy for new webkit
-rm -fr fancy-0.9.14
+rm -r fancy-0.9.14
tar -xjvf %{SOURCE2}
+mv fancy fancy-%{fancy}
+
+# extract cvs version of vcalendar plugin for crash-fix
+rm -r vcalendar-2.0.11
+tar -xvf %{SOURCE3}
+
%build
#acpi_notifier
@@ -432,8 +400,7 @@ cd ../clamd-%{clamd}
%{__make} %{?_smp_mflags}
# fancy
-#cd ../fancy-%{fancy}
-cd ../fancy
+cd ../fancy-%{fancy}
autoreconf -fi
%configure --disable-static --disable-dependency-tracking
%{__make} %{?_smp_mflags}
@@ -445,22 +412,27 @@ cd ../fetchinfo-plugin-%{fetchinfo}
# gdata
%if !0%{?rhel}
-#cd ../gdata_plugin-%{gdata}
-cd ../gdata
+cd ../gdata_plugin-%{gdata}
autoreconf -fi
%configure --disable-static --disable-dependency-tracking
%{__make} %{?_smp_mflags}
%endif
-%if 0%{?fedora} >= 12
#geolocation-plugin
+%if 0%{?fedora} >= 12
cd ../geolocation_plugin-%{geolocation}
-%configure --disable-static --disable-dependency-tracking
-%{__make} %{?_smp_mflags}
+#
+# Cannot build this with libchamplain-gtk using gtk3 and
+# Claws Mail using gtk2 (bugzilla 758173 and 662800).
+# Reactivating via sections 'build', 'install' and 'files'.
+#
+echo "Currently not built as Claws Mail still uses GTK+ 2." > README.Fedora
+#configure --disable-static --disable-dependency-tracking
+#%{__make} %{?_smp_mflags}
%endif
-%if 0%{?fedora} < 16
#gtkhtml2-viewer
+%if 0%{?fedora} < 16
cd ../gtkhtml2_viewer-%{gtkhtml2viewer}
%configure --disable-static --disable-dependency-tracking --disable-rpath
%{__make} %{?_smp_mflags} LIBTOOL=%{_bindir}/libtool
@@ -505,8 +477,8 @@ cd ../spam_report-%{spamreport}
%configure --disable-static --disable-dependency-tracking
%{__make} %{?_smp_mflags}
-%if !0%{?rhel}
#tnef
+%if !0%{?rhel}
cd ../tnef_parse-%{tnef}
OLDCFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -I%{_includedir}/libytnef" \
@@ -520,9 +492,8 @@ cd ../vcalendar-%{vcalendar}
%configure --disable-static --disable-dependency-tracking
%{__make} %{?_smp_mflags} LIBTOOL=/usr/bin/libtool
-%install
-rm -rf $RPM_BUILD_ROOT
+%install
# acpi_notifier
cd acpi_notifier-%{acpinotifier}
%{__make} install DESTDIR=$RPM_BUILD_ROOT CLAWS_MAIL_PLUGINDIR=%{_libdir}/claws-mail/plugins/
@@ -565,8 +536,7 @@ cd -
%find_lang clamd
#fancy
-#cd fancy-%{fancy}
-cd fancy
+cd fancy-%{fancy}
%{__make} install DESTDIR=$RPM_BUILD_ROOT CLAWS_MAIL_PLUGINDIR=%{_libdir}/claws-mail/plugins/
cd -
%find_lang fancy
@@ -578,8 +548,7 @@ cd -
# gdata
%if !0%{?rhel}
-cd gdata
-#cd gdata_plugin-%{gdata}
+cd gdata_plugin-%{gdata}
%{__make} install DESTDIR=$RPM_BUILD_ROOT CLAWS_MAIL_PLUGINDIR=%{_libdir}/claws-mail/plugins/
cd -
%find_lang gdata_plugin
@@ -588,9 +557,10 @@ cd -
%if 0%{?fedora} >= 12
#geolocation-plugin
cd geolocation_plugin-%{geolocation}
-%{__make} install DESTDIR=$RPM_BUILD_ROOT CLAWS_MAIL_PLUGINDIR=%{_libdir}/claws-mail/plugins/
+#%{__make} install DESTDIR=$RPM_BUILD_ROOT CLAWS_MAIL_PLUGINDIR=%{_libdir}/claws-mail/plugins/
cd -
-%find_lang geolocation_plugin
+#%find_lang geolocation_plugin
+touch geolocation_plugin.lang
%endif
%if 0%{?fedora} < 16
@@ -659,15 +629,11 @@ cd -
find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';'
find ${RPM_BUILD_ROOT} -type f -name "*.a" -exec rm -f {} ';'
-%clean
-rm -rf $RPM_BUILD_ROOT
%files
-%defattr(-,root,root,-)
%doc RELEASE_NOTES
%files acpi-notifier -f acpi_notifier.lang
-%defattr(-,root,root,-)
%doc acpi_notifier-%{acpinotifier}/ChangeLog
%doc acpi_notifier-%{acpinotifier}/COPYING
%doc acpi_notifier-%{acpinotifier}/NEWS
@@ -676,7 +642,6 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/claws-mail/plugins/acpi_notifier*
%files archive -f archive.lang
-%defattr(-,root,root,-)
%doc archive-%{archive}/ABOUT-NLS
%doc archive-%{archive}/AUTHORS
%doc archive-%{archive}/ChangeLog
@@ -690,7 +655,6 @@ rm -rf $RPM_BUILD_ROOT
%{_includedir}/claws-mail/plugins/archive/
%files attachwarner -f attachwarner.lang
-%defattr(-,root,root,-)
%{_libdir}/claws-mail/plugins/attachwarner*
%doc attachwarner-%{attachwarner}/AUTHORS
%doc attachwarner-%{attachwarner}/ChangeLog
@@ -699,7 +663,6 @@ rm -rf $RPM_BUILD_ROOT
%doc attachwarner-%{attachwarner}/TODO
%files address-keeper -f address_keeper.lang
-%defattr(-,root,root,-)
%doc address_keeper-%{addresskeeper}/AUTHORS
%doc address_keeper-%{addresskeeper}/ChangeLog
%doc address_keeper-%{addresskeeper}/COPYING
@@ -709,7 +672,6 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/claws-mail/plugins/address_keeper*
%files att-remover
-%defattr(-,root,root,-)
%doc att_remover-%{attremover}/AUTHORS
%doc att_remover-%{attremover}/ChangeLog
%doc att_remover-%{attremover}/COPYING
@@ -718,7 +680,6 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/claws-mail/plugins/att_remover*
%files bsfilter -f bsfilter_plugin.lang
-%defattr(-,root,root,-)
%doc bsfilter_plugin-%{bsfilter}/AUTHORS
%doc bsfilter_plugin-%{bsfilter}/ChangeLog
%doc bsfilter_plugin-%{bsfilter}/COPYING
@@ -726,7 +687,6 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/claws-mail/plugins/bsfilter*
%files clamd -f clamd.lang
-%defattr(-,root,root,-)
%doc clamd-%{clamd}/AUTHORS
%doc clamd-%{clamd}/ChangeLog
%doc clamd-%{clamd}/COPYING
@@ -735,19 +695,13 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/claws-mail/plugins/clamd*
%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/COPYING
-%doc fancy/AUTHORS
-%doc fancy/README
-%doc fancy/ChangeLog
+%doc fancy-%{fancy}/COPYING
+%doc fancy-%{fancy}/AUTHORS
+%doc fancy-%{fancy}/README
+%doc fancy-%{fancy}/ChangeLog
%{_libdir}/claws-mail/plugins/fancy*
%files fetchinfo
-%defattr(-,root,root,-)
%doc fetchinfo-plugin-%{fetchinfo}/ChangeLog
%doc fetchinfo-plugin-%{fetchinfo}/COPYING
%doc fetchinfo-plugin-%{fetchinfo}/README
@@ -755,37 +709,31 @@ rm -rf $RPM_BUILD_ROOT
%if !0%{?rhel}
%files gdata -f gdata_plugin.lang
-%defattr(-,root,root,-)
-#%doc gdata_plugin-%{gdata}/AUTHORS
-#%doc gdata_plugin-%{gdata}/ChangeLog
-#%doc gdata_plugin-%{gdata}/COPYING
-#%doc gdata_plugin-%{gdata}/README
-%doc gdata/AUTHORS
-%doc gdata/ChangeLog
-%doc gdata/COPYING
-%doc gdata/README
+%doc gdata_plugin-%{gdata}/AUTHORS
+%doc gdata_plugin-%{gdata}/ChangeLog
+%doc gdata_plugin-%{gdata}/COPYING
+%doc gdata_plugin-%{gdata}/README
%{_libdir}/claws-mail/plugins/gdata*
%endif
%if 0%{?fedora} >= 12
%files geolocation -f geolocation_plugin.lang
-%defattr(-,root,root,-)
-%doc geolocation_plugin-%{geolocation}/ChangeLog
-%doc geolocation_plugin-%{geolocation}/COPYING
-%doc geolocation_plugin-%{geolocation}/README
-%{_libdir}/claws-mail/plugins/geolocation*
+# temporarily included only!
+%doc geolocation_plugin-%{geolocation}/README.Fedora
+#%doc geolocation_plugin-%{geolocation}/ChangeLog
+#%doc geolocation_plugin-%{geolocation}/COPYING
+#%doc geolocation_plugin-%{geolocation}/README
+#%{_libdir}/claws-mail/plugins/geolocation*
%endif
%if 0%{?fedora} < 16
%files gtkhtml2-viewer -f gtkhtml2_viewer.lang
-%defattr(-,root,root,-)
%doc gtkhtml2_viewer-%{gtkhtml2viewer}/AUTHORS
%doc gtkhtml2_viewer-%{gtkhtml2viewer}/COPYING
%{_libdir}/claws-mail/plugins/gtkhtml2_viewer*
%endif
%files mailmbox
-%defattr(-,root,root,-)
%doc mailmbox-%{mailmbox}/AUTHORS
%doc mailmbox-%{mailmbox}/ChangeLog
%doc mailmbox-%{mailmbox}/COPYING
@@ -793,7 +741,6 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/claws-mail/plugins/mailmbox*
%files newmail
-%defattr(-,root,root,-)
%doc newmail-%{newmail}/AUTHORS
%doc newmail-%{newmail}/ChangeLog
%doc newmail-%{newmail}/COPYING
@@ -802,7 +749,6 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/claws-mail/plugins/newmail.so
%files notification -f notification_plugin.lang
-%defattr(-,root,root,-)
%doc notification_plugin-%{notification}/AUTHORS
%doc notification_plugin-%{notification}/ChangeLog
%doc notification_plugin-%{notification}/COPYING
@@ -811,7 +757,6 @@ rm -rf $RPM_BUILD_ROOT
%{_includedir}/notification_plugin
%files perl
-%defattr(-,root,root,-)
%doc perl_plugin-%{perl}/AUTHORS
%doc perl_plugin-%{perl}/ChangeLog
%doc perl_plugin-%{perl}/COPYING
@@ -821,7 +766,6 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/claws-mail/plugins/perl_plugin.so
%files python -f python_plugin.lang
-%defattr(-,root,root,-)
%doc python_plugin-%{python}/AUTHORS
%doc python_plugin-%{python}/ChangeLog
%doc python_plugin-%{python}/COPYING
@@ -830,20 +774,17 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/claws-mail/plugins/python_plugin*
%files rssyl -f rssyl.lang
-%defattr(-,root,root,-)
%doc rssyl-%{rssyl}/AUTHORS
%doc rssyl-%{rssyl}/ChangeLog
%doc rssyl-%{rssyl}/COPYING
%{_libdir}/claws-mail/plugins/rssyl*
%files spam-report -f spam_report.lang
-%defattr(-,root,root,-)
%doc spam_report-%{spamreport}/{AUTHORS,ChangeLog,COPYING,NEWS,README}
%{_libdir}/claws-mail/plugins/spamreport.so
%if !0%{?rhel}
%files tnef -f tnef_parse.lang
-%defattr(-,root,root,-)
%doc tnef_parse-%{tnef}/AUTHORS
%doc tnef_parse-%{tnef}/ChangeLog
%doc tnef_parse-%{tnef}/COPYING
@@ -852,7 +793,6 @@ rm -rf $RPM_BUILD_ROOT
%endif
%files vcalendar -f vcalendar.lang
-%defattr(-,root,root,-)
%doc vcalendar-%{vcalendar}/AUTHORS
%doc vcalendar-%{vcalendar}/ChangeLog
%doc vcalendar-%{vcalendar}/COPYING
@@ -863,6 +803,16 @@ rm -rf $RPM_BUILD_ROOT
%{_includedir}/claws-mail/plugins/vcalendar/
%changelog
+* Wed Nov 30 2011 Michael Schwendt <mschwendt at fedoraproject.org>
+- 3.7.10-10
+- don't build geolocation plugin since we can't mix gtk2 and gtk3
+ (#758173, #662800)
+- remove libchamplain* pkg-config hacks for geolocation plugin
+ (it supports 0.4 to 0.8 only)
+- merge newer vcalendar plugin to fix a crash (#742249)
+- drop ancient Obsoletes/Provides
+- drop old spec sections not needed anymore
+
* Fri Nov 25 2011 Michael Schwendt <mschwendt at fedoraproject.org>
- 3.7.10-9
- fix missing %%doc files in -perl subpackage (#707662)
diff --git a/sources b/sources
index 0e4f957..cda23e2 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,4 @@
fe782b2d4762c9727e22c1bb7979f7d6 claws-mail-extra-plugins-3.7.10.tar.bz2
d3d794962ef3d259d3400db6f116dd17 gdata-0.2cvs11.tar.bz2
ed7f91eff46cedcbb0307407912e8bfc fancy-0.9.14cvs1.tar.bz2
+5f446458cb7513ae03582a8fa980517a vcalendar-2.0.11cvs11.tar.gz
More information about the scm-commits
mailing list