[devel] mailutils

[Евгений Ростовцев]

Привет!

http://git.altlinux.org/people/real/packages/mailutils.git

Могу сам собрать (ACL есть), а можете у меня смержить. Какой вариант
предпочтительней?

На всякий случай добавил объявление top_builddir:

From: Eugeny A. Rostovtsev <real на altlinux.org>
Date: Sun, 7 Feb 2010 20:03:09 +0000 (+0000)
Subject: mailutils/Makefile.am: add top_builddir definition
X-Git-Tag: 2.1-alt0.20091105.4~2
X-Git-Url: http://git.altlinux.org/people/real/packages/mailutils.git?p=mailutils.git;a=commitdiff_plain;h=491f84b765a1d2e6a25544ac84e6b2d73c989dfc

mailutils/Makefile.am: add top_builddir definition
---

diff --git a/mailutils/Makefile.am b/mailutils/Makefile.am
index 5cabed2..7c8461a 100644
--- a/mailutils/Makefile.am
+++ b/mailutils/Makefile.am
@@ -18,6 +18,8 @@
 ##   Foundation, Inc.  51 Franklin Street, Fifth Floor, Boston, MA
 ##   02110-1301 USA

+top_builddir = @top_builddir@
+
 ACLOCAL_AMFLAGS = -I m4 -I am

 if MU_COND_PYTHON


> Есть подозрение, что этот модуль - noarch.

Подозрение не подтвердилось.

Один из .la пришлось заменить на .so в конфиге.

From: Eugeny A. Rostovtsev <real на altlinux.org>
Date: Sun, 7 Feb 2010 20:05:04 +0000 (+0000)
Subject: mailutils/configure.ac: fix libmu_py (.la -> .so)
X-Git-Tag: 2.1-alt0.20091105.4~1
X-Git-Url: http://git.altlinux.org/people/real/packages/mailutils.git?p=mailutils.git;a=commitdiff_plain;h=27908f33a0ed7a2e0ab4e23b37851e7e2375321d

mailutils/configure.ac: fix libmu_py (.la -> .so)
---

diff --git a/mailutils/configure.ac b/mailutils/configure.ac
index e6151ce..c890204 100644
--- a/mailutils/configure.ac
+++ b/mailutils/configure.ac
@@ -37,6 +37,8 @@ AC_SUBST(VI_REVISION, 2)
 AC_SUBST(VI_AGE,      1)

 dnl Library paths
+top_builddir=@TOP@
+AC_SUBST(top_builddir)
 AC_SUBST(MU_LIB_AUTH,'${top_builddir}/libmu_auth/libmu_auth.la')
 AC_SUBST(MU_LIB_MAILUTILS,'${top_builddir}/mailbox/libmailutils.la')
 AC_SUBST(MU_LIB_SQL,'${top_builddir}/sql/libsql.la')
@@ -1135,7 +1137,7 @@ if test "$status_python" = yes; then

     if test "$status_python" = yes; then
       AC_DEFINE(WITH_PYTHON,1,[Enable Python support])
-      MU_LIB_PY='${top_builddir}/python/libmu_py/libmu_py.la'
+      MU_LIB_PY='${top_builddir}/python/libmu_py/.libs/libmu_py.so'
       AC_SUBST([PYTHON_SITE_DIR])
       AC_SUBST([PYTHON_EXEC_DIR])
       AC_ARG_WITH([pythondir],

И ещё это было косячное использование distutils

Там ещё aclocal дурил, пришлось подчищать.

From: Eugeny A. Rostovtsev <real на altlinux.org>
Date: Sun, 7 Feb 2010 20:11:52 +0000 (+0000)
Subject: 2.1-alt0.20091105.4
X-Git-Tag: 2.1-alt0.20091105.4^0
X-Git-Url: http://git.altlinux.org/people/real/packages/mailutils.git?p=mailutils.git;a=commitdiff_plain;h=0952b0f210796fe815b2a4125a25327edd0b16af

2.1-alt0.20091105.4

- Fixed get_python_lib using
- configure: .la war
---

diff --git a/mailutils.spec b/mailutils.spec
index 36c4e2f..b0268cf 100644
--- a/mailutils.spec
+++ b/mailutils.spec
@@ -7,7 +7,7 @@ Name: mailutils
 %if %snapshot
 %define snapshotdate 20091105
 Version: %baseversion
-Release: alt0.%snapshotdate.3
+Release: alt0.%snapshotdate.4
 %define srcdir %name-%snapshotdate
 %else
 Version: %baseversion
@@ -38,6 +38,7 @@ Provides: /bin/mail

 Requires: libmailutils = %{version}-%{release}, guile >= 1.8, libreadline
 BuildRequires: rpm-build-licenses
+BuildPreReq: /usr/bin/cvs

 # Automatically added by buildreq on Thu Mar 12 2009
 BuildRequires: emacs-X11 flex gcc-c++ guile18-devel libgmp-devel
libldap-devel libltdl-devel libncurses-devel libpam-devel
libreadline-devel libwrap-devel python-devel
@@ -209,15 +210,16 @@ Python bindings for GNU Mailutils.
 %endif

 %patch1 -p0
+sed -i "s|@TOP@|$PWD|" configure.ac

 gzip ChangeLog

 %build

-#autoreconf -f -i -s
+%autoreconf
+sed -i 's|get_python_lib[^)]*|get_python_lib(1|' aclocal.m4

 %set_verify_elf_method unresolved=relaxed
-%undefine __libtoolize

 CFLAGS="-ltinfo"
 %configure --enable-mh-utils --with-mh-bindir=%_libexecdir/mu-mh
@@ -356,6 +358,10 @@ rm -f $RPM_BUILD_ROOT%python_sitelibdir/mailutils/c_api.la
 %python_sitelibdir/mailutils/*.py*

 %changelog
+* Sun Feb 07 2010 Eugeny A. Rostovtsev (REAL) <real at altlinux.org>
2.1-alt0.20091105.4
+- Fixed get_python_lib using
+- configure: .la war
+
 * Sun Jan 31 2010 Sergey Y. Afonin <asy на altlinux.ru> 2.1-alt0.20091105.3
 - created symlinks (for better exchangeability with the mailx package):
   Mail -> mail

-- 
REAL aka Евгений Ростовцев, программист ЦНИТ КемГУ