[packages/mailutils/DEVEL-3.5] - updated to 3.5 (note: guile part requires guile >= 2.2.0) - updated link patch - removed obsolete

Wed Oct 31 09:22:18 CET 2018

commit 17f975c27fe5c6fb5b9b945798e2a4911a9bee18
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Wed Oct 31 09:25:52 2018 +0100

    - updated to 3.5 (note: guile part requires guile >= 2.2.0)
    - updated link patch
    - removed obsolete db,format patches
    - added includes patch

 link.patch               | 10 +++++-----
 mailutils-db.patch       | 24 ------------------------
 mailutils-format.patch   | 11 -----------
 mailutils-includes.patch | 11 +++++++++++
 mailutils.spec           | 14 ++++++++------
 5 files changed, 24 insertions(+), 46 deletions(-)
---

diff --git a/mailutils.spec b/mailutils.spec
index f2c8d69..8074a9b 100644
--- a/mailutils.spec
+++ b/mailutils.spec
@@ -28,17 +28,16 @@
 Summary:	GNU mail utilities
 Summary(pl.UTF-8):	Narzędzia pocztowe z projektu GNU
 Name:		mailutils
-Version:	3.4
+Version:	3.5
 Release:	1
 License:	GPL v3+
 Group:		Applications/Mail
 Source0:	http://ftp.gnu.org/gnu/mailutils/%{name}-%{version}.tar.xz
-# Source0-md5:	d43568e9a1f40ae063a84c3a408f40a1
+# Source0-md5:	c3d93a143a7920edd5fcc20a658ca9cf
 Patch0:		%{name}-info.patch
 Patch1:		%{name}-tinfo.patch
 Patch2:		link.patch
-Patch3:		%{name}-db.patch
-Patch4:		%{name}-format.patch
+Patch3:		%{name}-includes.patch
 URL:		http://www.gnu.org/software/mailutils/mailutils.html
 BuildRequires:	autoconf >= 2.63
 BuildRequires:	automake >= 1:1.11
@@ -49,7 +48,7 @@ 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_guile:BuildRequires:	guile-devel >= 5:2.2.0}
 %{?with_odbc:%{?with_iodbc:BuildRequires:	libiodbc-devel}}
 BuildRequires:	libltdl-devel
 %if %{with cxx}
@@ -184,7 +183,6 @@ skrzynek pocztowych.
 %patch1 -p0
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
 
 %{__rm} po/stamp-po
 
@@ -254,7 +252,9 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/dotlock
 %attr(755,root,root) %{_bindir}/frm
 %attr(755,root,root) %{_bindir}/from
+%if %{with guile}
 %attr(755,root,root) %{_bindir}/guimb
+%endif
 %attr(755,root,root) %{_bindir}/mailutils
 %attr(755,root,root) %{_bindir}/messages
 %attr(755,root,root) %{_bindir}/mimeview
@@ -353,7 +353,9 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %ghost %{_libdir}/libmu_sieve.so.5
 %attr(755,root,root) %{_libdir}/libmuaux.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libmuaux.so.5
+%if %{with guile}
 %attr(755,root,root) %{_libdir}/libguile-mailutils-v-%{version}.so
+%endif
 
 %files devel
 %defattr(644,root,root,755)
diff --git a/link.patch b/link.patch
index 1f1369d..a99cf44 100644
--- a/link.patch
+++ b/link.patch
@@ -38,9 +38,9 @@
 +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 @@
+--- mailutils-3.5/Makefile.am.orig	2018-07-28 17:24:19.000000000 +0200
++++ mailutils-3.5/Makefile.am	2018-10-30 21:05:45.491907245 +0100
+@@ -92,14 +92,12 @@
   libproto\
   testsuite\
   lib\
@@ -49,13 +49,13 @@
   $(LIBMU_SCM_DIR)\
   $(LIBMU_DBM_DIR)\
   libmu_sieve\
-  $(PYTHON_DIR)\
+  python\
   doc\
 - examples\
   mu\
   $(SCHEME_DIR)\
   $(FRM_DIR)\
-@@ -113,6 +111,8 @@
+@@ -109,6 +107,8 @@
   $(MAIL_DIR)\
   $(SIEVE_DIR)\
   $(MESSAGES_DIR)\
diff --git a/mailutils-db.patch b/mailutils-db.patch
deleted file mode 100644
index 786e665..0000000
--- a/mailutils-db.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- mailutils-3.1.1/configure.ac.orig	2017-02-12 09:59:42.887027050 +0100
-+++ mailutils-3.1.1/configure.ac	2017-02-12 11:02:17.426984182 +0100
-@@ -506,10 +506,10 @@
-   BDB2)   check_bdb 2 db db_open
-           test -n "$status_bdb" && status_dbm="$status_dbm,Berkeley DB v. $status_bdb";;
- 
--  BDB)    for version in 4 3 2
-+  BDB)    for version in 6 5 4 3 2
- 	  do
- 		case $version in
--		4|3) func=db_create;;
-+		6|5|4|3) func=db_create;;
- 		2)   func=db_open;;
- 		esac
- 		check_bdb $version db $func
-@@ -523,7 +523,7 @@
- 	  name=`expr $1 : 'BDB=\(.*\)'`
-   	  case $name in
- 	  [[0-9]]*)  check_slackware_bdb $name;;
--	  *)	     for version in 4 3 2
-+	  *)	     for version in 6 5 4 3 2
- 	             do
- 			case $version in
- 			4|3) func=db_create;;
diff --git a/mailutils-format.patch b/mailutils-format.patch
deleted file mode 100644
index b312f38..0000000
--- a/mailutils-format.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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;
- }
- 
diff --git a/mailutils-includes.patch b/mailutils-includes.patch
new file mode 100644
index 0000000..8a1ede9
--- /dev/null
+++ b/mailutils-includes.patch
@@ -0,0 +1,11 @@
+Include <limits.h> for MB_LEN_MAX (4 is incorrect and conflicts with wchar2.h)
+--- mailutils-3.5/frm/frm.h.orig	2018-02-10 07:06:00.000000000 +0100
++++ mailutils-3.5/frm/frm.h	2018-10-31 07:27:35.661481230 +0100
+@@ -24,6 +24,7 @@
+ #include <string.h>
+ #include <unistd.h>
+ #include <fcntl.h>
++#include <limits.h>
+ #include <sys/types.h>
+ #ifdef HAVE_TERMIOS_H
+ # include <termios.h>
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/mailutils.git/commitdiff/17f975c27fe5c6fb5b9b945798e2a4911a9bee18

