Hello community, here is the log from the commit of package mailutils for openSUSE:Factory checked in at 2019-12-11 12:01:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mailutils (Old) and /work/SRC/openSUSE:Factory/.mailutils.new.4691 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mailutils" Wed Dec 11 12:01:24 2019 rev:7 rq:754378 version:3.8 Changes: -------- --- /work/SRC/openSUSE:Factory/mailutils/mailutils.changes 2019-11-15 22:33:13.932048154 +0100 +++ /work/SRC/openSUSE:Factory/.mailutils.new.4691/mailutils.changes 2019-12-11 12:02:40.240802300 +0100 @@ -1,0 +2,12 @@ +Thu Dec 5 13:05:18 UTC 2019 - Dr. Werner Fink <[email protected]> + +- Correct location of mime.types used by cups (boo#1158532) + +------------------------------------------------------------------- +Wed Nov 27 20:36:16 CET 2019 - Matej Cepl <[email protected]> + +- Add python38-compat.patch making it possible to build the + package with Python 3.8. + http://savannah.gnu.org/bugs/index.php?57318 + +------------------------------------------------------------------- New: ---- python38-compat.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mailutils.spec ++++++ --- /var/tmp/diff_new_pack.zzmadN/_old 2019-12-11 12:02:41.544801752 +0100 +++ /var/tmp/diff_new_pack.zzmadN/_new 2019-12-11 12:02:41.552801748 +0100 @@ -1,7 +1,7 @@ # # spec file for package mailutils # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,13 +16,11 @@ # +%define somajor 5 # See bug boo#1095783 # Currently disabled suid/sgid program dotlock and maidag %bcond_with set_user_identity %bcond_with guile_22 - -%define somajor 5 - Name: mailutils Version: 3.8 Release: 0 @@ -36,6 +34,9 @@ Patch0: lisp-load-silent.patch Patch2: silent-rpmlint-with_initgroups.patch Patch3: mailutils-3.5-guile-2.0.patch +# PATCH-FIX-UPSTREAM python38-compat.patch http://savannah.gnu.org/bugs/index.php?57318 [email protected] +# Remove incompatibility with Python 3.8+ +Patch4: python38-compat.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: bison @@ -43,38 +44,41 @@ BuildRequires: cyrus-sasl-gssapi BuildRequires: fdupes BuildRequires: flex -BuildRequires: libtool -%if 0 -# Seems not compatible with original radius (missing debug.h) -BuildRequires: freeradius-server-devel -%endif BuildRequires: gcc-c++ BuildRequires: guile-devel BuildRequires: help2man BuildRequires: libmysqld-devel +BuildRequires: libtool BuildRequires: m4 BuildRequires: makeinfo BuildRequires: openldap2-devel BuildRequires: pam-devel +BuildRequires: pkgconfig +# Does not compile due API changes +BuildRequires: readline-devel +BuildRequires: tcpd-devel +BuildRequires: update-alternatives BuildRequires: pkgconfig(fribidi) BuildRequires: pkgconfig(gnutls) BuildRequires: pkgconfig(krb5-gssapi) BuildRequires: pkgconfig(kyotocabinet) BuildRequires: pkgconfig(libgsasl) -# Does not compile due API changes -BuildRequires: readline-devel -BuildRequires: tcpd-devel -BuildRequires: update-alternatives BuildRequires: pkgconfig(python3) Requires: guile = %(rpm -q --queryformat '%%{VERSION}' guile-devel) +Requires(post): %{install_info_prereq} Requires(post): update-alternatives +Requires(preun): %{install_info_prereq} Requires(preun): update-alternatives -Requires(post): %install_info_prereq -Requires(preun): %install_info_prereq +%if 0 +# Seems not compatible with original radius (missing debug.h) +BuildRequires: freeradius-server-devel +%endif %if %{with set_user_identity} Requires(post): permissions Requires(verify): permissions %endif +# Hard requirement as mimeview uses /usr/share/cups/mime/mime.types +Requires: cups %description Mailutils is a set of utilities and daemons for processing e-mail. @@ -153,8 +157,8 @@ %package devel Summary: Development files for GNU Mailutils Group: Development/Libraries/C and C++ -Requires: libmailutils%{somajor} == %{version} -Requires: mailutils == %{version} +Requires: libmailutils%{somajor} = %{version} +Requires: mailutils = %{version} %description devel This package includes libraries and header files for building tools to @@ -174,6 +178,7 @@ %setup -q %patch0 %patch2 +%patch4 -p1 set -- %(rpm -q --queryformat '%%{VERSION}' guile-devel | sed -r 's@\.@ @g') (cat > guile.list)<<-EOF %dir %{_datadir}/guile/site/$1.$2/ @@ -188,9 +193,9 @@ echo Using guile $1.$2.$3 mv libmu_scm libmu_scm-guile-2.2 mv include/mailutils/guile.h include/mailutils/guile-2.2.h - tar xfJ %{S:1} - autoreconf -fiv + tar xfJ %{SOURCE1} fi +autoreconf -fiv # # Avoid build require for emacs as emacs does # build require one the sub packages herein! @@ -255,7 +260,8 @@ --with-lispdir=%{_datadir}/emacs/site-lisp \ --with-log-facility=LOG_MAIL \ --with-kyotocabinet \ - CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" + CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" \ + DEFAULT_CUPS_CONFDIR=%{_datarootdir}/cups/mime make %{?_smp_mflags} @@ -329,7 +335,7 @@ %fdupes -s %{buildroot}%{_libexecdir}/python*/site-packages/mailutils/ -%find_lang %name +%find_lang %{name} %post %install_info --info-dir=%{_infodir} %{_infodir}/mailutils.info.gz @@ -359,12 +365,11 @@ %verify_permissions %{_sbindir}/maidag %endif -%files -f %name.lang -f guile.list -%defattr(-,root,root) +%files -f %{name}.lang -f guile.list %license COPYING COPYING.LESSER %doc ChangeLog README NEWS AUTHORS THANKS -%doc %{_infodir}/mailutils.info*.gz -%doc %{_mandir}/man1/*.1%{?ext_man} +%{_infodir}/mailutils.info*.gz +%{_mandir}/man1/*.1%{?ext_man} %if %{with set_user_identity} %config %{_sysconfdir}/permissions.d/mailutils* %endif @@ -401,8 +406,8 @@ %{_libdir}/mailutils/*.so %dir %{_libdir}/python*/site-packages/mailutils/ %{_libdir}/python*/site-packages/mailutils/c_api.so + %files mh -%defattr(-,root,root) %dir %{_bindir}/mu-mh/ %{_bindir}/mu-mh/* %{_datadir}/emacs/site-lisp/mailutils-mh.el @@ -412,29 +417,24 @@ %if %{with set_user_identity} %files delivery -%defattr(-,root,root) %{_sbindir}/lmtpd %attr(04755,root,root) %verify(not mode) %{_sbindir}/mda %{_bindir}/putmail %endif %files notify -%defattr(-,root,root) %{_sbindir}/comsatd -%doc %{_mandir}/man8/comsatd.8%{?ext_man} +%{_mandir}/man8/comsatd.8%{?ext_man} %files imap4d -%defattr(-,root,root) %{_sbindir}/imap4d -%doc %{_mandir}/man8/imap4d.8%{?ext_man} +%{_mandir}/man8/imap4d.8%{?ext_man} %files pop3d -%defattr(-,root,root) %{_sbindir}/pop3d -%doc %{_mandir}/man8/pop3d.8%{?ext_man} +%{_mandir}/man8/pop3d.8%{?ext_man} %files devel -%defattr(-,root,root) %{_libdir}/*.so %dir %{_includedir}/mailutils/ %{_includedir}/mailutils/*.h @@ -443,7 +443,6 @@ %{_datadir}/aclocal/mailutils.m4 %files -n libmailutils%{somajor} -%defattr(-,root,root) %{_libdir}/*.so.* %changelog ++++++ python38-compat.patch ++++++ --- a/configure.ac +++ b/configure.ac @@ -1233,7 +1233,7 @@ if test "$status_python" = yes; then status_python=no esac - PYTHON_LIBS=`$PYTHON_CONFIG --libs` + PYTHON_LIBS=`$PYTHON_CONFIG --libs --embed` || PYTHON_LIBS=`$PYTHON_CONFIG --libs` PYTHON_INCLUDES=`$PYTHON_CONFIG --includes` else status_python=no
