[packages/mailutils] - updated to 3.4 - updated link patch - added format patch

qboosh qboosh at pld-linux.org
Sun Dec 10 22:15:38 CET 2017 

commit 5e30679681d166d39fb08913f8450b9fa56694e6
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Dec 10 22:16:53 2017 +0100

    - updated to 3.4
    - updated link patch
    - added format patch

 link.patch             | 36 +++++++++++++++++++++
 mailutils-format.patch | 11 +++++++
 mailutils.spec         | 86 +++++++++++++++++++++++++++-----------------------
 3 files changed, 94 insertions(+), 39 deletions(-)
---
diff --git a/mailutils.spec b/mailutils.spec
index 0c5f259..f2c8d69 100644
--- a/mailutils.spec
+++ b/mailutils.spec
@@ -2,7 +2,7 @@
 # - look at files in main package (more split?)
 # - guile and python packages? (note: maidag and mu-mh/inc link with libmu_scm/libmu_py libraries)
 # - scripts for daemons
-# - dbm switches? (GDBM BDB NDBM TC KCberkeley db?)
+# - dbm switches? (GDBM BDB NDBM TC KC)
 #
 # Conditional build:
 %bcond_without	gssapi	# GSSAPI authentication (krb5 or heimdal)
@@ -11,6 +11,7 @@
 %bcond_without	radius	# RADIUS support
 %bcond_without	sasl	# without SASL (using GNU SASL)
 # language support
+%bcond_without	cxx	# C++ wrapper
 %bcond_without	guile	# Guile support
 %bcond_without	python	# Python support
 # SQL:
@@ -19,7 +20,6 @@
 %bcond_without	odbc	# ODBC module (any variant)
 %bcond_with	iodbc	# ODBC module using libiodbc
 # broken code:
-%bcond_with	cxx	# C++ wrapper [broken in 3.x]
 %bcond_with	nntp	# NNTP support [broken in 3.x]
 #
 %if %{without odbc}
@@ -28,28 +28,29 @@
 Summary:	GNU mail utilities
 Summary(pl.UTF-8):	Narzędzia pocztowe z projektu GNU
 Name:		mailutils
-Version:	3.1.1
+Version:	3.4
 Release:	1
 License:	GPL v3+
 Group:		Applications/Mail
 Source0:	http://ftp.gnu.org/gnu/mailutils/%{name}-%{version}.tar.xz
-# Source0-md5:	dc7d1e5d65037a053d0ea354d3b88bb7
+# Source0-md5:	d43568e9a1f40ae063a84c3a408f40a1
 Patch0:		%{name}-info.patch
 Patch1:		%{name}-tinfo.patch
 Patch2:		link.patch
 Patch3:		%{name}-db.patch
+Patch4:		%{name}-format.patch
 URL:		http://www.gnu.org/software/mailutils/mailutils.html
 BuildRequires:	autoconf >= 2.63
 BuildRequires:	automake >= 1:1.11
 BuildRequires:	bison
 BuildRequires:	flex
 BuildRequires:	fribidi-devel
-BuildRequires:	gettext-tools >= 0.18
+BuildRequires:	gettext-tools >= 0.19
 %{?with_radius:BuildRequires:	gnu-radius-devel >= 1.6}
 BuildRequires:	gnutls-devel >= 1.2.5
 %{?with_sasl:BuildRequires:	gsasl-devel >= 0.2.3}
 %{?with_guile:BuildRequires:	guile-devel >= 1.8}
-%{?with_odbc:%{!?with_iodbc:BuildRequires:	libiodbc-devel}}
+%{?with_odbc:%{?with_iodbc:BuildRequires:	libiodbc-devel}}
 BuildRequires:	libltdl-devel
 %if %{with cxx}
 BuildRequires:	libstdc++-devel
@@ -79,7 +80,8 @@ Requires:	%{name}-libs = %{version}-%{release}
 Obsoletes:	mailutils-doc
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_libexecdir	%{_sbindir}
+# mailutils variant of traditional PREFIX/bin/mh dir (FHS disallows */bin subdir other than plain "mh")
+%define		mh_bindir	%{_libexecdir}/mu-mh
 
 %description
 GNU mail utilities.
@@ -182,6 +184,7 @@ skrzynek pocztowych.
 %patch1 -p0
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %{__rm} po/stamp-po
 
@@ -194,6 +197,7 @@ skrzynek pocztowych.
 %configure \
 	%{!?with_gss:ac_cv_header_gss_h=no} \
 	%{!?with_cxx:--disable-cxx} \
+	%{!?debug:--disable-debug} \
 	--enable-experimental \
 	%{!?with_nntp:--disable-nntp} \
 	%{!?with_python:--disable-python} \
@@ -257,40 +261,44 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/movemail
 %attr(755,root,root) %{_bindir}/readmsg
 %attr(755,root,root) %{_bindir}/sieve
-%attr(755,root,root) %{_bindir}/sieve2scm
 %attr(755,root,root) %{_sbindir}/comsatd
 %attr(755,root,root) %{_sbindir}/maidag
-# traditional bin/mh dir
-%dir %{_libexecdir}/mu-mh
-%attr(755,root,root) %{_libexecdir}/mu-mh/ali
-%attr(755,root,root) %{_libexecdir}/mu-mh/anno
-%attr(755,root,root) %{_libexecdir}/mu-mh/burst
-%attr(755,root,root) %{_libexecdir}/mu-mh/comp
-%attr(755,root,root) %{_libexecdir}/mu-mh/fmtcheck
-%attr(755,root,root) %{_libexecdir}/mu-mh/folder
-%attr(755,root,root) %{_libexecdir}/mu-mh/folders
-%attr(755,root,root) %{_libexecdir}/mu-mh/forw
-%attr(755,root,root) %{_libexecdir}/mu-mh/inc
-%attr(755,root,root) %{_libexecdir}/mu-mh/install-mh
-%attr(755,root,root) %{_libexecdir}/mu-mh/mark
-%attr(755,root,root) %{_libexecdir}/mu-mh/mhl
-%attr(755,root,root) %{_libexecdir}/mu-mh/mhn
-%attr(755,root,root) %{_libexecdir}/mu-mh/mhparam
-%attr(755,root,root) %{_libexecdir}/mu-mh/mhpath
-%attr(755,root,root) %{_libexecdir}/mu-mh/mhseq
-%attr(755,root,root) %{_libexecdir}/mu-mh/msgchk
-%attr(755,root,root) %{_libexecdir}/mu-mh/pick
-%attr(755,root,root) %{_libexecdir}/mu-mh/prompter
-%attr(755,root,root) %{_libexecdir}/mu-mh/refile
-%attr(755,root,root) %{_libexecdir}/mu-mh/repl
-%attr(755,root,root) %{_libexecdir}/mu-mh/rmf
-%attr(755,root,root) %{_libexecdir}/mu-mh/rmm
-%attr(755,root,root) %{_libexecdir}/mu-mh/scan
-%attr(755,root,root) %{_libexecdir}/mu-mh/send
-%attr(755,root,root) %{_libexecdir}/mu-mh/show
-%attr(755,root,root) %{_libexecdir}/mu-mh/sortm
-%attr(755,root,root) %{_libexecdir}/mu-mh/whatnow
-%attr(755,root,root) %{_libexecdir}/mu-mh/whom
+%dir %{mh_bindir}
+%attr(755,root,root) %{mh_bindir}/ali
+%attr(755,root,root) %{mh_bindir}/anno
+%attr(755,root,root) %{mh_bindir}/burst
+%attr(755,root,root) %{mh_bindir}/comp
+%attr(755,root,root) %{mh_bindir}/fmtcheck
+%attr(755,root,root) %{mh_bindir}/folder
+%attr(755,root,root) %{mh_bindir}/folders
+%attr(755,root,root) %{mh_bindir}/forw
+%attr(755,root,root) %{mh_bindir}/inc
+%attr(755,root,root) %{mh_bindir}/install-mh
+%attr(755,root,root) %{mh_bindir}/mark
+%attr(755,root,root) %{mh_bindir}/mhl
+%attr(755,root,root) %{mh_bindir}/mhn
+%attr(755,root,root) %{mh_bindir}/mhparam
+%attr(755,root,root) %{mh_bindir}/mhpath
+%attr(755,root,root) %{mh_bindir}/mhseq
+%attr(755,root,root) %{mh_bindir}/msgchk
+%attr(755,root,root) %{mh_bindir}/next
+%attr(755,root,root) %{mh_bindir}/pick
+%attr(755,root,root) %{mh_bindir}/prev
+%attr(755,root,root) %{mh_bindir}/prompter
+%attr(755,root,root) %{mh_bindir}/refile
+%attr(755,root,root) %{mh_bindir}/repl
+%attr(755,root,root) %{mh_bindir}/rmf
+%attr(755,root,root) %{mh_bindir}/rmm
+%attr(755,root,root) %{mh_bindir}/scan
+%attr(755,root,root) %{mh_bindir}/send
+%attr(755,root,root) %{mh_bindir}/show
+%attr(755,root,root) %{mh_bindir}/sortm
+%attr(755,root,root) %{mh_bindir}/whatnow
+%attr(755,root,root) %{mh_bindir}/whom
+%if "%{_libexecdir}" != "%{_libdir}"
+%dir %{_libexecdir}/mailutils
+%endif
+%attr(755,root,root) %{_libexecdir}/mailutils/mailutils-*
 %dir %{_libdir}/mailutils
 %attr(755,root,root) %{_libdir}/mailutils/*.so
 %{_datadir}/mailutils
diff --git a/link.patch b/link.patch
index c4e6de2..1f1369d 100644
--- a/link.patch
+++ b/link.patch
@@ -28,3 +28,39 @@
        AC_CHECK_HEADERS(tcpd.h,
                         [status_tcpwrap=yes],
                         [status_tcpwrap=no])
+--- mailutils-3.4/libmu_cpp/Makefile.am.orig	2017-06-08 15:08:20.000000000 +0200
++++ mailutils-3.4/libmu_cpp/Makefile.am	2017-12-10 21:03:12.276619950 +0100
+@@ -42,6 +42,6 @@
+  stream.cc\
+  url.cc
+ 
+-libmu_cpp_la_LIBADD = @MU_COMMON_LIBRARIES@
++libmu_cpp_la_LIBADD = $(top_builddir)/libmailutils/libmailutils.la $(top_builddir)/libmu_sieve/libmu_sieve.la $(top_builddir)/libproto/pop/libmu_pop.la @MU_COMMON_LIBRARIES@
+ libmu_cpp_la_LDFLAGS = -rpath $(libdir)  -version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@
+ 
+--- mailutils-3.4/Makefile.am.orig	2017-10-18 10:51:32.000000000 +0200
++++ mailutils-3.4/Makefile.am	2017-12-10 21:26:46.673270471 +0100
+@@ -96,14 +96,12 @@
+  libproto\
+  testsuite\
+  lib\
+- $(LIBMU_CPP_DIR)\
+  $(GINT_DIR)\
+  $(LIBMU_SCM_DIR)\
+  $(LIBMU_DBM_DIR)\
+  libmu_sieve\
+  $(PYTHON_DIR)\
+  doc\
+- examples\
+  mu\
+  $(SCHEME_DIR)\
+  $(FRM_DIR)\
+@@ -113,6 +111,8 @@
+  $(MAIL_DIR)\
+  $(SIEVE_DIR)\
+  $(MESSAGES_DIR)\
++ $(LIBMU_CPP_DIR)\
++ examples\
+  $(COMSAT_DIR)\
+  $(READMSG_DIR)\
+  $(DOTLOCK_DIR)\
diff --git a/mailutils-format.patch b/mailutils-format.patch
new file mode 100644
index 0000000..b312f38
--- /dev/null
+++ b/mailutils-format.patch
@@ -0,0 +1,11 @@
+--- mailutils-3.4/mimeview/lexer.l.orig	2017-06-16 08:43:05.000000000 +0200
++++ mailutils-3.4/mimeview/lexer.l	2017-12-10 19:55:37.903332913 +0100
+@@ -277,7 +277,7 @@
+ int
+ yyerror (char *s)
+ {
+-  mu_error (s);
++  mu_error ("%s", s);
+   return 0;
+ }
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/mailutils.git/commitdiff/5e30679681d166d39fb08913f8450b9fa56694e6

More information about the pld-cvs-commit mailing list