[claws-mail-plugins] - 3.7.8-5 - disable tnef on rhel

Andreas Bierfert awjb at fedoraproject.org
Mon Jan 24 21:02:18 UTC 2011


commit 1bc23a7f91ffa6a66cdebcc36e7731da163e9269
Author: Andreas Bierfert <andreas.bierfert at lowlatency.de>
Date:   Mon Jan 24 22:03:06 2011 +0100

    - 3.7.8-5
    - disable tnef on rhel

 claws-mail-plugins.spec |   20 ++++++++++++++++++--
 1 files changed, 18 insertions(+), 2 deletions(-)
---
diff --git a/claws-mail-plugins.spec b/claws-mail-plugins.spec
index b9118ce..eeb7a34 100644
--- a/claws-mail-plugins.spec
+++ b/claws-mail-plugins.spec
@@ -22,7 +22,7 @@
 
 Name:           claws-mail-plugins
 Version:        3.7.8
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Additional plugins for claws-mail
 
 Group:          Applications/Internet
@@ -45,7 +45,9 @@ BuildRequires:  libidn-devel
 BuildRequires:  libtool
 BuildRequires:  gpgme-devel
 BuildRequires:  libarchive-devel
+%if !0%{?rhel}
 BuildRequires:  libytnef-devel
+%endif
 BuildRequires:  ghostscript
 BuildRequires:  enchant-devel
 BuildRequires:  webkitgtk-devel
@@ -78,7 +80,9 @@ Requires:       %{name}-perl = %{version}-%{release}
 Requires:       %{name}-python = %{version}-%{release}
 Requires:       %{name}-rssyl = %{version}-%{release}
 Requires:       %{name}-spam-report = %{version}-%{release}
+%if !0%{?rhel}
 Requires:       %{name}-tnef = %{version}-%{release}
+%endif
 Requires:       %{name}-vcalendar = %{version}-%{release}
 
 # and the ones from main claws-mail-package...
@@ -288,6 +292,7 @@ Requires:	claws-mail >= %{version}
 %description spam-report
 This plugin can report spam mails to various places.
 
+%if !0%{?rhel}
 %package tnef
 Summary:        Tnef message parsing
 Group:          Applications/Internet
@@ -295,6 +300,7 @@ Requires:	claws-mail >= %{version}
 
 %description tnef
 This plugin allows reading of application/ms-tnef attachments.
+%endif
 
 %package vcalendar
 Summary:        vCalendar message handling
@@ -424,11 +430,13 @@ cd ../spam_report-%{spamreport}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
+%if !0%{?rhel}
 #tnef
 cd ../tnef_parse-%{tnef}
 CFLAGS="-I%{_includedir}/libytnef" \
     %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
+%endif
 
 #vcalendar
 cd ../vcalendar-%{vcalendar}
@@ -543,11 +551,13 @@ cd spam_report-%{spamreport}
 cd -
 %find_lang spam_report
 
+%if !0%{?rhel}
 #tnef
 cd tnef_parse-%{tnef}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT CLAWS_MAIL_PLUGINDIR=%{_libdir}/claws-mail/plugins/
 cd -
 %find_lang tnef_parse
+%endif
 
 #vcalendar
 cd vcalendar-%{vcalendar}
@@ -719,6 +729,7 @@ rm -rf $RPM_BUILD_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
@@ -726,6 +737,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc tnef_parse-%{tnef}/COPYING
 %doc tnef_parse-%{tnef}/README
 %{_libdir}/claws-mail/plugins/tnef*
+%endif
 
 %files vcalendar -f vcalendar.lang
 %defattr(-,root,root,-)
@@ -739,8 +751,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/claws-mail/plugins/vcalendar/
 
 %changelog
+* Mon Jan 24 2011 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 3.7.8-5
+- disable tnef on rhel
+
 * Sun Jan 23 2011 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
-- 3.7.8-3
+- 3.7.8-4
 - disable dillo on rhel
 - make python plugin dlopen right python so (#666335)
 - include python plugin examples (#664265)


More information about the scm-commits mailing list