[claws-mail-plugins] - 3.7.8-3 - disable dillo on rhel - make python plugin dlopen right python so (#666335) - include py

Andreas Bierfert awjb at fedoraproject.org
Mon Jan 24 07:00:33 UTC 2011


commit 269aa88d0ae83cdc780a805153b3a1ca2b705fff
Author: Andreas Bierfert <andreas.bierfert at lowlatency.de>
Date:   Mon Jan 24 08:01:02 2011 +0100

    - 3.7.8-3
    - disable dillo on rhel
    - make python plugin dlopen right python so (#666335)
    - include python plugin examples (#664265)

 claws-mail-plugins.spec |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 deletions(-)
---
diff --git a/claws-mail-plugins.spec b/claws-mail-plugins.spec
index a0a13a9..b9118ce 100644
--- a/claws-mail-plugins.spec
+++ b/claws-mail-plugins.spec
@@ -22,7 +22,7 @@
 
 Name:           claws-mail-plugins
 Version:        3.7.8
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Additional plugins for claws-mail
 
 Group:          Applications/Internet
@@ -82,7 +82,9 @@ Requires:       %{name}-tnef = %{version}-%{release}
 Requires:       %{name}-vcalendar = %{version}-%{release}
 
 # and the ones from main claws-mail-package...
+%if !0%{?rhel}
 Requires:       %{name}-dillo
+%endif
 Requires:       %{name}-spamassassin
 Requires:       %{name}-pgp
 Requires:       %{name}-bogofilter
@@ -404,6 +406,10 @@ cd ../perl_plugin-%{perl}
 
 #python
 cd ../python_plugin-%{python}
+# point the configure script at the right libpython file name because
+# the library will be dlopened at run-time
+grep 'PYTHON_VERSION}.so"' configure || exit -1
+sed -i -e 's!PYTHON_VERSION}.so"!PYTHON_VERSION}.so.1.0"!' configure
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
@@ -698,6 +704,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc python_plugin-%{python}/ChangeLog
 %doc python_plugin-%{python}/COPYING
 %doc python_plugin-%{python}/README
+%doc python_plugin-%{python}/examples/
 %{_libdir}/claws-mail/plugins/python_plugin*
 
 %files rssyl -f rssyl.lang
@@ -732,6 +739,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/claws-mail/plugins/vcalendar/
 
 %changelog
+* Sun Jan 23 2011 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 3.7.8-3
+- disable dillo on rhel
+- make python plugin dlopen right python so (#666335)
+- include python plugin examples (#664265)
+
 * Mon Jan 10 2011 Matthias Clasen <mclasen at redhat.com>
 - Rebuild against newer gtk
 


More information about the scm-commits mailing list