reapply patch for libguile2 [release 2.99.99-2mamba;Mon May 16 2016]

mailutils-2.99.99-libguile-2.patch

@@ -1,14 +1,3 @@
---- mailutils-2.2/libmu_scm/mu_message.c.orig	2013-06-01 17:26:58.647144139 +0200
-+++ mailutils-2.2/libmu_scm/mu_message.c	2013-06-01 17:27:16.945963528 +0200
-@@ -511,7 +511,7 @@
-       SCM car = SCM_CAR (lst);
-       if (scm_is_string (car)
- 	  && mu_c_strncasecmp (scm_i_string_chars (car), name,
--			       scm_i_string_length (car)) == 0)
-+			       scm_c_string_length (car)) == 0)
- 	return 1;
-     }
-   return 0;
 diff -Nru mailutils-2.2.orig/configure mailutils-2.2/configure
 --- mailutils-2.2.orig/configure	2010-09-08 11:59:25.000000000 +0200
 +++ mailutils-2.2/configure	2013-06-02 17:56:58.470399782 +0200

mailutils.spec

@@ -1,45 +1,47 @@
 Name:          mailutils
-Version:       2.2
+Version:       2.99.99
-Release:       3mamba
+Release:       2mamba
 Summary:       A swiss army knife of electronic mail handling
 Group:         System/Tools
 Vendor:        openmamba
 Distribution:  openmamba
 Packager:      Silvan Calarco <silvan.calarco@mambasoft.it>
 URL:           http://mailutils.org/
-Source:        ftp://ftp.gnu.org/gnu/mailutils/mailutils-%{version}.tar.xz
+Source:        http://alpha.gnu.org/gnu/mailutils/mailutils-%{version}.tar.xz
+#Source:        ftp://ftp.gnu.org/gnu/mailutils/mailutils-%{version}.tar.xz
 Patch0:        mailutils-2.2-gcc-4.8.patch
-Patch1:        mailutils-2.2-libguile-2.patch
+Patch1:        mailutils-2.99.99-libguile-2.patch
 License:       GPL
 ## AUTOBUILDREQ-BEGIN
 BuildRequires: glibc-devel
 BuildRequires: libaudit-devel
+BuildRequires: libdb51-devel
 BuildRequires: libffi-devel
-BuildRequires: libfribidi-devel
-BuildRequires: libgcc
 BuildRequires: libgc-devel
-BuildRequires: libgcrypt-devel
+BuildRequires: libgdbm-devel
 BuildRequires: libgmp-devel
 BuildRequires: libgnutls-devel
-BuildRequires: libgpg-error-devel
+BuildRequires: libgsasl-devel
 BuildRequires: libguile-devel
+BuildRequires: libidn-devel
 BuildRequires: libltdl-devel
-BuildRequires: libncurses-devel
+BuildRequires: libncurses5
 BuildRequires: libnettle-devel
+BuildRequires: libntlm-devel
 BuildRequires: libopenldap-devel
 BuildRequires: libopenssl-devel
-BuildRequires: libpython27-devel
+BuildRequires: libp11-kit-devel
+BuildRequires: libpam-devel
 BuildRequires: libpython-devel
+BuildRequires: libpython27-devel
 BuildRequires: libreadline-devel
-BuildRequires: libsasl-devel
+BuildRequires: libsasl2-devel
-BuildRequires: libstdc++6-devel
 BuildRequires: libtasn1-devel
 BuildRequires: libunistring-devel
 BuildRequires: libwrap-devel
 BuildRequires: libz-devel
-BuildRequires: p11-kit-devel
-BuildRequires: pam-devel
 ## AUTOBUILDREQ-END
+BuildRequires: libunistring-devel >= 0.9.6-1mamba
 Requires:      lib%{name} = %{?epoch:%epoch:}%{version}-%{release}
 Requires(post): %{__install_info}
 Requires(preun): %{__install_info}
@@ -67,11 +69,12 @@ This package contains libraries and header files for developing applications tha
 
 %prep
 %setup -q
-%patch0 -p1
 %patch1 -p1
 
 %build
-%configure
+%configure \
+   GUILE_BINDIR=`guile-config info prefix`/bin
+
 %make -j1
 
 %install
@@ -103,39 +106,17 @@ exit 0
 %{_bindir}/from
 %{_bindir}/guimb
 %{_bindir}/mail
+%{_bindir}/mailutils
 %{_bindir}/mailutils-config
 %{_bindir}/messages
 %{_bindir}/mimeview
 %{_bindir}/movemail
 %dir %{_bindir}/mu-mh
-%{_bindir}/mu-mh/ali
+%{_bindir}/mu-mh/*
-%{_bindir}/mu-mh/anno
+%{_bindir}/popauth
-%{_bindir}/mu-mh/burst
-%{_bindir}/mu-mh/comp
-%{_bindir}/mu-mh/fmtcheck
-%{_bindir}/mu-mh/folder
-%{_bindir}/mu-mh/folders
-%{_bindir}/mu-mh/forw
-%{_bindir}/mu-mh/inc
-%{_bindir}/mu-mh/install-mh
-%{_bindir}/mu-mh/mark
-%{_bindir}/mu-mh/mhl
-%{_bindir}/mu-mh/mhn
-%{_bindir}/mu-mh/mhparam
-%{_bindir}/mu-mh/mhpath
-%{_bindir}/mu-mh/pick
-%{_bindir}/mu-mh/refile
-%{_bindir}/mu-mh/repl
-%{_bindir}/mu-mh/rmf
-%{_bindir}/mu-mh/rmm
-%{_bindir}/mu-mh/scan
-%{_bindir}/mu-mh/send
-%{_bindir}/mu-mh/sortm
-%{_bindir}/mu-mh/whatnow
-%{_bindir}/mu-mh/whom
 %{_bindir}/readmsg
 %{_bindir}/sieve
-%{_bindir}/sieve.scm
+%{_bindir}/sieve2scm
 %{_sbindir}/comsatd
 %{_sbindir}/imap4d
 %{_sbindir}/maidag
@@ -151,59 +132,29 @@ exit 0
 %{_datadir}/guile/site/mailutils/sieve-modules/redirect.scm
 %{_datadir}/guile/site/mailutils/sieve-modules/reject.scm
 %{_datadir}/guile/site/mailutils/sieve-modules/vacation.scm
+%dir %{_datadir}/mailutils
+%dir %{_datadir}/mailutils/mh
+%{_datadir}/mailutils/mh/*
+%dir %{python27_sitelib}/mailutils
+%{python27_sitelib}/mailutils/*
 %{_infodir}/mailutils.info-1.gz
 %{_infodir}/mailutils.info-2.gz
 %{_infodir}/mailutils.info.gz
-%dir %{_datadir}/mailutils
+%{_mandir}/man1/imap4d.1*
-%dir %{_datadir}/mailutils/mh
+%{_mandir}/man1/mail.1*
-%{_datadir}/mailutils/mh/components
+%{_mandir}/man1/pop3d.1*
-%{_datadir}/mailutils/mh/mailutils-mh.el
+%{_mandir}/man1/popauth.1*
-%{_datadir}/mailutils/mh/mhl.format
-%{_datadir}/mailutils/mh/replcomps
-%{_datadir}/mailutils/mh/replgroupcomps
-%{_mandir}/man1/imap4d.1.gz
-%{_mandir}/man1/mail.1.gz
-%{_mandir}/man1/pop3d.1.gz
-%{_mandir}/man1/popauth.1.gz
 
 %files -n lib%{name}
 %defattr(-,root,root)
 %{_libdir}/libmailutils.so.*
-%{_libdir}/libmu_auth.so.*
+%{_libdir}/libmuaux.so.*
-%{_libdir}/libmu_cfg.so.*
+%{_libdir}/libmu_*.so.*
-%{_libdir}/libmu_cpp.so.*
+%{_libdir}/libguile-mailutils-v-*.so
-%{_libdir}/libmu_imap.so.*
-%{_libdir}/libmu_maildir.so.*
-%{_libdir}/libmu_mailer.so.*
-%{_libdir}/libmu_mbox.so.*
-%{_libdir}/libmu_mh.so.*
-%{_libdir}/libmu_nntp.so.*
-%{_libdir}/libmu_pop.so.*
-%{_libdir}/libmu_py.so.*
-%{_libdir}/libmu_scm.so.*
-%{_libdir}/libmu_sieve.so.*
 %dir %{_libdir}/mailutils
-%{_libdir}/mailutils/list.a
+%{_libdir}/mailutils/*.a
-%{_libdir}/mailutils/list.la
+%{_libdir}/mailutils/*.la
-%{_libdir}/mailutils/list.so
+%{_libdir}/mailutils/*.so
-%{_libdir}/mailutils/moderator.a
-%{_libdir}/mailutils/moderator.la
-%{_libdir}/mailutils/moderator.so
-%{_libdir}/mailutils/numaddr.a
-%{_libdir}/mailutils/numaddr.la
-%{_libdir}/mailutils/numaddr.so
-%{_libdir}/mailutils/pipe.a
-%{_libdir}/mailutils/pipe.la
-%{_libdir}/mailutils/pipe.so
-%{_libdir}/mailutils/spamd.a
-%{_libdir}/mailutils/spamd.la
-%{_libdir}/mailutils/spamd.so
-%{_libdir}/mailutils/timestamp.a
-%{_libdir}/mailutils/timestamp.la
-%{_libdir}/mailutils/timestamp.so
-%{_libdir}/mailutils/vacation.a
-%{_libdir}/mailutils/vacation.la
-%{_libdir}/mailutils/vacation.so
 %dir %{python_sitearch}/mailutils
 %{python_sitearch}/mailutils/*
 %doc AUTHORS COPYING COPYING.LESSER THANKS
@@ -212,53 +163,25 @@ exit 0
 %defattr(-,root,root)
 %dir %{_includedir}/mailutils
 %{_includedir}/mailutils/*
-%{_libdir}/libguile-mailutils-v-2.2.so
 %{_libdir}/libmailutils.a
 %{_libdir}/libmailutils.la
 %{_libdir}/libmailutils.so
-%{_libdir}/libmu_argp.a
+%{_libdir}/libmuaux.a
-%{_libdir}/libmu_auth.a
+%{_libdir}/libmuaux.la
-%{_libdir}/libmu_auth.la
+%{_libdir}/libmuaux.so
-%{_libdir}/libmu_auth.so
+%{_libdir}/libmu_*.a
-%{_libdir}/libmu_cfg.a
+%{_libdir}/libmu_*.la
-%{_libdir}/libmu_cfg.la
+%{_libdir}/libmu_*.so
-%{_libdir}/libmu_cfg.so
-%{_libdir}/libmu_cpp.a
-%{_libdir}/libmu_cpp.la
-%{_libdir}/libmu_cpp.so
-%{_libdir}/libmu_imap.a
-%{_libdir}/libmu_imap.la
-%{_libdir}/libmu_imap.so
-%{_libdir}/libmu_maildir.a
-%{_libdir}/libmu_maildir.la
-%{_libdir}/libmu_maildir.so
-%{_libdir}/libmu_mailer.a
-%{_libdir}/libmu_mailer.la
-%{_libdir}/libmu_mailer.so
-%{_libdir}/libmu_mbox.a
-%{_libdir}/libmu_mbox.la
-%{_libdir}/libmu_mbox.so
-%{_libdir}/libmu_mh.a
-%{_libdir}/libmu_mh.la
-%{_libdir}/libmu_mh.so
-%{_libdir}/libmu_nntp.a
-%{_libdir}/libmu_nntp.la
-%{_libdir}/libmu_nntp.so
-%{_libdir}/libmu_pop.a
-%{_libdir}/libmu_pop.la
-%{_libdir}/libmu_pop.so
-%{_libdir}/libmu_py.a
-%{_libdir}/libmu_py.la
-%{_libdir}/libmu_py.so
-%{_libdir}/libmu_scm.a
-%{_libdir}/libmu_scm.la
-%{_libdir}/libmu_scm.so
-%{_libdir}/libmu_sieve.a
-%{_libdir}/libmu_sieve.la
-%{_libdir}/libmu_sieve.so
 %doc ChangeLog NEWS README TODO
 
 %changelog
+* Mon May 16 2016 Silvan Calarco <silvan.calarco@mambasoft.it> 2.99.99-2mamba
+- reapply patch for libguile2
+
+* Sun May 15 2016 Silvan Calarco <silvan.calarco@mambasoft.it> 2.99.99-1mamba
+- update to 2.99.99
+- rebuilt by autoport with build requirements: libunistring-devel>=0.9.6-1mamba
+
 * Sun Jun 02 2013 Silvan Calarco <silvan.calarco@mambasoft.it> 2.2-3mamba
 - update guile-2 patch to fix GUILE_BINDIR