[claws-mail-plugins] 3.7.10-5 fix requires for mock

Andreas Bierfert awjb at fedoraproject.org
Tue Sep 27 18:22:27 UTC 2011 

commit 0dffff2ff05919c969e48619e86918a1805dfc14
Author: Andreas Bierfert <andreas.bierfert at lowlatency.de>
Date:   Tue Sep 27 20:22:11 2011 +0200

    3.7.10-5
    fix requires for mock

 claws-mail-plugins.spec |   95 +++++++++++++++++++++++++---------------------
 1 files changed, 52 insertions(+), 43 deletions(-)
---
diff --git a/claws-mail-plugins.spec b/claws-mail-plugins.spec
index af743a3..d7f75b2 100644
--- a/claws-mail-plugins.spec
+++ b/claws-mail-plugins.spec
@@ -1,3 +1,4 @@
+%global pluginapi 3.7.10.0
 # define plugin version
 %global acpinotifier    1.0.25
 %global addresskeeper   1.0.4
@@ -23,7 +24,7 @@
 
 Name:           claws-mail-plugins
 Version:        3.7.10
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Additional plugins for claws-mail
 
 Group:          Applications/Internet
@@ -116,8 +117,8 @@ Additional plugins for claws-mail
 %package acpi-notifier
 Summary:        ACPI notification plugin for claws-mail 
 Group:          Applications/Internet
-Requires:       claws-mail(plugin-api)%{?_isa} = %(eval "%{_bindir}/claws-mail-plugin-api")
-%{?_isa:Requires: claws-mail(plugin-api) = %(eval "%{_bindir}/claws-mail-plugin-api")}
+Requires:       claws-mail(plugin-api)%{?_isa} = %pluginapi
+%{?_isa:Requires: claws-mail(plugin-api) = %pluginapi}
 # Dec 2006
 Provides:       sylpheed-claws-plugins-acpi-notifier = %{version}-%{release}
 Obsoletes:      sylpheed-claws-plugins-acpi-notifier <= 2.6.0
@@ -129,8 +130,8 @@ the 'Plugins/Acpi Notifier' page of the preferences.
 %package address-keeper
 Summary:        Never forget a typed address
 Group:          Applications/Internet
-Requires:       claws-mail(plugin-api)%{?_isa} = %(eval "%{_bindir}/claws-mail-plugin-api")
-%{?_isa:Requires: claws-mail(plugin-api) = %(eval "%{_bindir}/claws-mail-plugin-api")}
+Requires:       claws-mail(plugin-api)%{?_isa} = %pluginapi
+%{?_isa:Requires: claws-mail(plugin-api) = %pluginapi}
 
 %description address-keeper
 This plugin allows saving outgoing addresses to a designated folder
@@ -140,8 +141,8 @@ address book to avoid unwanted duplicates.
 %package archive
 Summary:        Archiving features for claws-mail 
 Group:          Applications/Internet
-Requires:       claws-mail(plugin-api)%{?_isa} = %(eval "%{_bindir}/claws-mail-plugin-api")
-%{?_isa:Requires: claws-mail(plugin-api) = %(eval "%{_bindir}/claws-mail-plugin-api")}
+Requires:       claws-mail(plugin-api)%{?_isa} = %pluginapi
+%{?_isa:Requires: claws-mail(plugin-api) = %pluginapi}
 
 %description archive
 %{summary}
@@ -149,8 +150,8 @@ Requires:       claws-mail(plugin-api)%{?_isa} = %(eval "%{_bindir}/claws-mail-p
 %package attachwarner
 Summary:        Attachment warner plugin for claws-mail 
 Group:          Applications/Internet
-Requires:       claws-mail(plugin-api)%{?_isa} = %(eval "%{_bindir}/claws-mail-plugin-api")
-%{?_isa:Requires: claws-mail(plugin-api) = %(eval "%{_bindir}/claws-mail-plugin-api")}
+Requires:       claws-mail(plugin-api)%{?_isa} = %pluginapi
+%{?_isa:Requires: claws-mail(plugin-api) = %pluginapi}
 
 %description attachwarner
 Warns when the user composes a message mentioning an attachment in the message
@@ -160,8 +161,8 @@ body but without attaching any files to the message.
 %package att-remover
 Summary:        Attachments remover plugin for claws-mail 
 Group:          Applications/Internet
-Requires:       claws-mail(plugin-api)%{?_isa} = %(eval "%{_bindir}/claws-mail-plugin-api")
-%{?_isa:Requires: claws-mail(plugin-api) = %(eval "%{_bindir}/claws-mail-plugin-api")}
+Requires:       claws-mail(plugin-api)%{?_isa} = %pluginapi
+%{?_isa:Requires: claws-mail(plugin-api) = %pluginapi}
 # Dec 2006
 Provides:       sylpheed-claws-plugins-att-remover = %{version}-%{release}
 Obsoletes:      sylpheed-claws-plugins-att-remover <= 2.6.0
@@ -173,8 +174,8 @@ choose 'Remove attachments' from the sub-menu.
 %package bsfilter
 Summary:        Bayesian spam filtering for claws-mail
 Group:          Applications/Internet
-Requires:       claws-mail(plugin-api)%{?_isa} = %(eval "%{_bindir}/claws-mail-plugin-api")
-%{?_isa:Requires: claws-mail(plugin-api) = %(eval "%{_bindir}/claws-mail-plugin-api")}
+Requires:       claws-mail(plugin-api)%{?_isa} = %pluginapi
+%{?_isa:Requires: claws-mail(plugin-api) = %pluginapi}
 
 %description bsfilter
 Bayesian spam filtering for claws-mail using Bsfilter.
@@ -182,8 +183,8 @@ Bayesian spam filtering for claws-mail using Bsfilter.
 %package clamd
 Summary:        Use Clam AntiVirus to scan all messages
 Group:          Applications/Internet
-Requires:       claws-mail(plugin-api)%{?_isa} = %(eval "%{_bindir}/claws-mail-plugin-api")
-%{?_isa:Requires: claws-mail(plugin-api) = %(eval "%{_bindir}/claws-mail-plugin-api")}
+Requires:       claws-mail(plugin-api)%{?_isa} = %pluginapi
+%{?_isa:Requires: claws-mail(plugin-api) = %pluginapi}
 # was dropped as of 3.3.1 -> use this as 'successor'
 Provides:       claws-mail-plugins-clamav = %{version}-%{release}
 
@@ -197,8 +198,8 @@ Options can be found in /Configuration/Preferences/Plugins/Clam AntiVirus.
 %package fancy
 Summary:        Render HTML emails via WebKit
 Group:          Applications/Internet
-Requires:       claws-mail(plugin-api)%{?_isa} = %(eval "%{_bindir}/claws-mail-plugin-api")
-%{?_isa:Requires: claws-mail(plugin-api) = %(eval "%{_bindir}/claws-mail-plugin-api")}
+Requires:       claws-mail(plugin-api)%{?_isa} = %pluginapi
+%{?_isa:Requires: claws-mail(plugin-api) = %pluginapi}
 
 %description fancy
 This plugin renders HTML email via the GTK+ port of the WebKit library.
@@ -206,8 +207,8 @@ This plugin renders HTML email via the GTK+ port of the WebKit library.
 %package fetchinfo
 Summary:        Inserts headers containing some download information
 Group:          Applications/Internet
-Requires:       claws-mail(plugin-api)%{?_isa} = %(eval "%{_bindir}/claws-mail-plugin-api")
-%{?_isa:Requires: claws-mail(plugin-api) = %(eval "%{_bindir}/claws-mail-plugin-api")}
+Requires:       claws-mail(plugin-api)%{?_isa} = %pluginapi
+%{?_isa:Requires: claws-mail(plugin-api) = %pluginapi}
 # Dec 2006
 Provides:       sylpheed-claws-plugins-fetchinfo = %{version}-%{release}
 Obsoletes:      sylpheed-claws-plugins-fetchinfo <= 2.6.0
@@ -220,8 +221,8 @@ UIDL, Sylpheeds account name, POP server, user ID and retrieval time.
 %package gdata
 Summary:        Access to GData (Google services) for Claws Mail
 Group:          Application/Internet
-Requires:       claws-mail(plugin-api)%{?_isa} = %(eval "%{_bindir}/claws-mail-plugin-api")
-%{?_isa:Requires: claws-mail(plugin-api) = %(eval "%{_bindir}/claws-mail-plugin-api")}
+Requires:       claws-mail(plugin-api)%{?_isa} = %pluginapi
+%{?_isa:Requires: claws-mail(plugin-api) = %pluginapi}
 
 %description gdata
 Access to GData (Google services) for Claws Mail.
@@ -234,8 +235,8 @@ Google contacts into the address completion.
 %package geolocation
 Summary:        Provide GeoLocation functionality
 Group:          Applications/Internet
-Requires:       claws-mail(plugin-api)%{?_isa} = %(eval "%{_bindir}/claws-mail-plugin-api")
-%{?_isa:Requires: claws-mail(plugin-api) = %(eval "%{_bindir}/claws-mail-plugin-api")}
+Requires:       claws-mail(plugin-api)%{?_isa} = %pluginapi
+%{?_isa:Requires: claws-mail(plugin-api) = %pluginapi}
 
 %description geolocation
 This plugin provides GeoLocation functionality
@@ -245,8 +246,8 @@ This plugin provides GeoLocation functionality
 %package gtkhtml2-viewer
 Summary:        GTK Html Viewer
 Group:          Applications/Internet
-Requires:       claws-mail(plugin-api)%{?_isa} = %(eval "%{_bindir}/claws-mail-plugin-api")
-%{?_isa:Requires: claws-mail(plugin-api) = %(eval "%{_bindir}/claws-mail-plugin-api")}
+Requires:       claws-mail(plugin-api)%{?_isa} = %pluginapi
+%{?_isa:Requires: claws-mail(plugin-api) = %pluginapi}
 # Dec 2006
 Provides:       sylpheed-claws-plugins-gtkhtml2-viewer = %{version}-%{release}
 Obsoletes:      sylpheed-claws-plugins-gtkhtml2-viewer <= 2.6.0
@@ -261,8 +262,8 @@ the preferences.
 %package mailmbox
 Summary:        Support for mailboxes in mbox format
 Group:          Applications/Internet
-Requires:       claws-mail(plugin-api)%{?_isa} = %(eval "%{_bindir}/claws-mail-plugin-api")
-%{?_isa:Requires: claws-mail(plugin-api) = %(eval "%{_bindir}/claws-mail-plugin-api")}
+Requires:       claws-mail(plugin-api)%{?_isa} = %pluginapi
+%{?_isa:Requires: claws-mail(plugin-api) = %pluginapi}
 # Dec 2006
 Provides:       sylpheed-claws-plugins-mailmbox = %{version}-%{release}
 Obsoletes:      sylpheed-claws-plugins-mailmbox <= 2.6.0
@@ -274,8 +275,8 @@ This plugin provides direct support for mailboxes in mbox format.
 %package newmail
 Summary:        Write a message header summary to a log file
 Group:          Applications/Internet
-Requires:       claws-mail(plugin-api)%{?_isa} = %(eval "%{_bindir}/claws-mail-plugin-api")
-%{?_isa:Requires: claws-mail(plugin-api) = %(eval "%{_bindir}/claws-mail-plugin-api")}
+Requires:       claws-mail(plugin-api)%{?_isa} = %pluginapi
+%{?_isa:Requires: claws-mail(plugin-api) = %pluginapi}
 # Dec 2006
 Provides:       sylpheed-claws-plugins-newmail = %{version}-%{release}
 Obsoletes:      sylpheed-claws-plugins-newmail <= 2.6.0
@@ -287,8 +288,8 @@ arrival of new mail *after* sorting.
 %package notification
 Summary:        New mail notifications
 Group:          Applications/Internet
-Requires:       claws-mail(plugin-api)%{?_isa} = %(eval "%{_bindir}/claws-mail-plugin-api")
-%{?_isa:Requires: claws-mail(plugin-api) = %(eval "%{_bindir}/claws-mail-plugin-api")}
+Requires:       claws-mail(plugin-api)%{?_isa} = %pluginapi
+%{?_isa:Requires: claws-mail(plugin-api) = %pluginapi}
 # Dec 2006
 Provides:       sylpheed-claws-plugins-notification = %{version}-%{release}
 Obsoletes:      sylpheed-claws-plugins-notification <= 2.6.0
@@ -301,8 +302,8 @@ unread) mail. Currently, a pop-up and a mail banner are implemented.
 Summary:        Extended filtering engine
 Group:          Applications/Internet
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-Requires:       claws-mail(plugin-api)%{?_isa} = %(eval "%{_bindir}/claws-mail-plugin-api")
-%{?_isa:Requires: claws-mail(plugin-api) = %(eval "%{_bindir}/claws-mail-plugin-api")}
+Requires:       claws-mail(plugin-api)%{?_isa} = %pluginapi
+%{?_isa:Requires: claws-mail(plugin-api) = %pluginapi}
 # Dec 2006
 Provides:       sylpheed-claws-plugins-perl = %{version}-%{release}
 Obsoletes:      sylpheed-claws-plugins-perl <= 2.6.0
@@ -314,8 +315,8 @@ claws-mail. It allows for the use of full perl power in email filters.
 %package python
 Summary:        Python scripting access to claws-mail
 Group:          Applications/Internet
-Requires:       claws-mail(plugin-api)%{?_isa} = %(eval "%{_bindir}/claws-mail-plugin-api")
-%{?_isa:Requires: claws-mail(plugin-api) = %(eval "%{_bindir}/claws-mail-plugin-api")}
+Requires:       claws-mail(plugin-api)%{?_isa} = %pluginapi
+%{?_isa:Requires: claws-mail(plugin-api) = %pluginapi}
 
 %description python
 This plugin offers a Python scripting access to Claws Mail. Python code can be
@@ -326,8 +327,8 @@ menu of the main window.
 %package rssyl
 Summary:        RSS plugin for claws-mail
 Group:          Applications/Internet
-Requires:       claws-mail(plugin-api)%{?_isa} = %(eval "%{_bindir}/claws-mail-plugin-api")
-%{?_isa:Requires: claws-mail(plugin-api) = %(eval "%{_bindir}/claws-mail-plugin-api")}
+Requires:       claws-mail(plugin-api)%{?_isa} = %pluginapi
+%{?_isa:Requires: claws-mail(plugin-api) = %pluginapi}
 # Dec 2006
 Provides:       sylpheed-claws-plugins-rssyl = %{version}-%{release}
 Obsoletes:      sylpheed-claws-plugins-rssyl <= 2.6.0
@@ -339,8 +340,8 @@ Allows you to read your favorite RSS news feeds in Claws. RSS 1.0,
 %package spam-report
 Summary:        Report spam mail to various places
 Group:          Applications/Internet
-Requires:       claws-mail(plugin-api)%{?_isa} = %(eval "%{_bindir}/claws-mail-plugin-api")
-%{?_isa:Requires: claws-mail(plugin-api) = %(eval "%{_bindir}/claws-mail-plugin-api")}
+Requires:       claws-mail(plugin-api)%{?_isa} = %pluginapi
+%{?_isa:Requires: claws-mail(plugin-api) = %pluginapi}
 
 %description spam-report
 This plugin can report spam mails to various places.
@@ -349,8 +350,8 @@ This plugin can report spam mails to various places.
 %package tnef
 Summary:        Tnef message parsing
 Group:          Applications/Internet
-Requires:       claws-mail(plugin-api)%{?_isa} = %(eval "%{_bindir}/claws-mail-plugin-api")
-%{?_isa:Requires: claws-mail(plugin-api) = %(eval "%{_bindir}/claws-mail-plugin-api")}
+Requires:       claws-mail(plugin-api)%{?_isa} = %pluginapi
+%{?_isa:Requires: claws-mail(plugin-api) = %pluginapi}
 
 %description tnef
 This plugin allows reading of application/ms-tnef attachments.
@@ -359,8 +360,8 @@ This plugin allows reading of application/ms-tnef attachments.
 %package vcalendar
 Summary:        Handling for vCalendar messages
 Group:          Applications/Internet
-Requires:       claws-mail(plugin-api)%{?_isa} = %(eval "%{_bindir}/claws-mail-plugin-api")
-%{?_isa:Requires: claws-mail(plugin-api) = %(eval "%{_bindir}/claws-mail-plugin-api")}
+Requires:       claws-mail(plugin-api)%{?_isa} = %pluginapi
+%{?_isa:Requires: claws-mail(plugin-api) = %pluginapi}
 # Dec 2006
 Provides:       sylpheed-claws-plugins-vcalendar = %{version}-%{release}
 Obsoletes:      sylpheed-claws-plugins-vcalendar <= 2.6.0
@@ -373,6 +374,10 @@ exporting of your meetings or all your calendars.
 %prep
 %setup -q -n claws-mail-extra-plugins-%{version}
 
+# guard for pluginapi
+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
@@ -860,6 +865,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/claws-mail/plugins/vcalendar/
 
 %changelog
+* Tue Sep 27 2011 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 3.7.10-5
+- fix requires for mock
+
 * Mon Sep 26 2011 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - 3.7.10-4
 - make plugin api isa dependent

More information about the scm-commits mailing list