[claws-mail: 1/2] 3.9.2-4
Michael Schwendt
mschwendt at fedoraproject.org
Mon Aug 5 09:17:31 UTC 2013
commit c91197cacafb8499cd6154b8371f237fae90f48a
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date: Mon Aug 5 11:14:50 2013 +0200
3.9.2-4
- fix FTBFS (#992061) / basically libetpan FTBFS for armv7hl
- fix Python plug-in crash: it dlopen's libpython2.7.so (#991138)
which would only be found in the optional -devel package, so replace
that with the fully versioned run-time libname in %prep
claws-mail.spec | 21 ++++++++++++++++++++-
1 files changed, 20 insertions(+), 1 deletions(-)
---
diff --git a/claws-mail.spec b/claws-mail.spec
index 041452e..d474979 100644
--- a/claws-mail.spec
+++ b/claws-mail.spec
@@ -2,7 +2,7 @@
Name: claws-mail
Version: 3.9.2
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Email client and news reader based on GTK+
Group: Applications/Internet
License: GPLv3+
@@ -359,6 +359,18 @@ exporting of your meetings or all your calendars.
SOURCEAPI=$(grep -A 1 VERSION_NUMERIC src/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
+# a really ugly hack to have the Python plug-in dlopen the versioned
+# run-time lib, with grep guards so we don't need a patch
+#
+# ensure that the definition exists
+grep 'PYTHON_SHARED_LIB=.*\.so\"$' configure || exit -1
+# append .1.0
+sed -i 's!\(PYTHON_SHARED_LIB=.*\.so\)\"$!\1.1.0!' configure
+# ensure that the definition no longer ends with .so"
+grep 'PYTHON_SHARED_LIB=.*\.so\"$' configure && exit -1
+# ensure that the code that uses it is still there
+grep 'dlopen.*PYTHON_SHARED_LIB' src/plugins/python/* -R || exit -1
+
%if 0%{?fedora}
cat << EOF > README.Fedora
@@ -545,6 +557,13 @@ fi
%{_libdir}/claws-mail/plugins/vcalendar*
%changelog
+* Mon Aug 5 2013 Michael Schwendt <mschwendt at fedoraproject.org>
+- 3.9.2-4
+- fix FTBFS (#992061) / basically libetpan FTBFS for armv7hl
+- fix Python plug-in crash: it dlopen's libpython2.7.so (#991138)
+ which would only be found in the optional -devel package, so replace
+ that with the fully versioned run-time libname in %%prep
+
* Sat Jul 13 2013 Michael Schwendt <mschwendt at fedoraproject.org>
- 3.9.2-3
- for Fedora based builds, require pinentry-gtk instead of the virtual
More information about the scm-commits
mailing list