Accepting request 751452 from home:mcepl:branches:server:mail
- Add python38-compat.patch making it possible to build the package with Python 3.8. http://savannah.gnu.org/bugs/index.php?57318 OBS-URL: https://build.opensuse.org/request/show/751452 OBS-URL: https://build.opensuse.org/package/show/server:mail/mailutils?expand=0&rev=26
This commit is contained in:
parent
b282ab147c
commit
17936a045b
@ -1,3 +1,10 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Nov 27 20:36:16 CET 2019 - Matej Cepl <mcepl@suse.com>
|
||||||
|
|
||||||
|
- Add python38-compat.patch making it possible to build the
|
||||||
|
package with Python 3.8.
|
||||||
|
http://savannah.gnu.org/bugs/index.php?57318
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue Nov 12 08:34:36 UTC 2019 - Dr. Werner Fink <werner@suse.de>
|
Tue Nov 12 08:34:36 UTC 2019 - Dr. Werner Fink <werner@suse.de>
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package mailutils
|
# 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
|
# All modifications and additions to the file contributed by third parties
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
@ -16,13 +16,11 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
|
|
||||||
|
%define somajor 5
|
||||||
# See bug boo#1095783
|
# See bug boo#1095783
|
||||||
# Currently disabled suid/sgid program dotlock and maidag
|
# Currently disabled suid/sgid program dotlock and maidag
|
||||||
%bcond_with set_user_identity
|
%bcond_with set_user_identity
|
||||||
%bcond_with guile_22
|
%bcond_with guile_22
|
||||||
|
|
||||||
%define somajor 5
|
|
||||||
|
|
||||||
Name: mailutils
|
Name: mailutils
|
||||||
Version: 3.8
|
Version: 3.8
|
||||||
Release: 0
|
Release: 0
|
||||||
@ -36,6 +34,9 @@ Source2: %{name}-rpmlintrc
|
|||||||
Patch0: lisp-load-silent.patch
|
Patch0: lisp-load-silent.patch
|
||||||
Patch2: silent-rpmlint-with_initgroups.patch
|
Patch2: silent-rpmlint-with_initgroups.patch
|
||||||
Patch3: mailutils-3.5-guile-2.0.patch
|
Patch3: mailutils-3.5-guile-2.0.patch
|
||||||
|
# PATCH-FIX-UPSTREAM python38-compat.patch http://savannah.gnu.org/bugs/index.php?57318 mcepl@suse.com
|
||||||
|
# Remove incompatibility with Python 3.8+
|
||||||
|
Patch4: python38-compat.patch
|
||||||
BuildRequires: autoconf
|
BuildRequires: autoconf
|
||||||
BuildRequires: automake
|
BuildRequires: automake
|
||||||
BuildRequires: bison
|
BuildRequires: bison
|
||||||
@ -43,34 +44,35 @@ BuildRequires: cpio
|
|||||||
BuildRequires: cyrus-sasl-gssapi
|
BuildRequires: cyrus-sasl-gssapi
|
||||||
BuildRequires: fdupes
|
BuildRequires: fdupes
|
||||||
BuildRequires: flex
|
BuildRequires: flex
|
||||||
BuildRequires: libtool
|
|
||||||
%if 0
|
|
||||||
# Seems not compatible with original radius (missing debug.h)
|
|
||||||
BuildRequires: freeradius-server-devel
|
|
||||||
%endif
|
|
||||||
BuildRequires: gcc-c++
|
BuildRequires: gcc-c++
|
||||||
BuildRequires: guile-devel
|
BuildRequires: guile-devel
|
||||||
BuildRequires: help2man
|
BuildRequires: help2man
|
||||||
BuildRequires: libmysqld-devel
|
BuildRequires: libmysqld-devel
|
||||||
|
BuildRequires: libtool
|
||||||
BuildRequires: m4
|
BuildRequires: m4
|
||||||
BuildRequires: makeinfo
|
BuildRequires: makeinfo
|
||||||
BuildRequires: openldap2-devel
|
BuildRequires: openldap2-devel
|
||||||
BuildRequires: pam-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(fribidi)
|
||||||
BuildRequires: pkgconfig(gnutls)
|
BuildRequires: pkgconfig(gnutls)
|
||||||
BuildRequires: pkgconfig(krb5-gssapi)
|
BuildRequires: pkgconfig(krb5-gssapi)
|
||||||
BuildRequires: pkgconfig(kyotocabinet)
|
BuildRequires: pkgconfig(kyotocabinet)
|
||||||
BuildRequires: pkgconfig(libgsasl)
|
BuildRequires: pkgconfig(libgsasl)
|
||||||
# Does not compile due API changes
|
|
||||||
BuildRequires: readline-devel
|
|
||||||
BuildRequires: tcpd-devel
|
|
||||||
BuildRequires: update-alternatives
|
|
||||||
BuildRequires: pkgconfig(python3)
|
BuildRequires: pkgconfig(python3)
|
||||||
Requires: guile = %(rpm -q --queryformat '%%{VERSION}' guile-devel)
|
Requires: guile = %(rpm -q --queryformat '%%{VERSION}' guile-devel)
|
||||||
|
Requires(post): %{install_info_prereq}
|
||||||
Requires(post): update-alternatives
|
Requires(post): update-alternatives
|
||||||
|
Requires(preun): %{install_info_prereq}
|
||||||
Requires(preun): update-alternatives
|
Requires(preun): update-alternatives
|
||||||
Requires(post): %install_info_prereq
|
%if 0
|
||||||
Requires(preun): %install_info_prereq
|
# Seems not compatible with original radius (missing debug.h)
|
||||||
|
BuildRequires: freeradius-server-devel
|
||||||
|
%endif
|
||||||
%if %{with set_user_identity}
|
%if %{with set_user_identity}
|
||||||
Requires(post): permissions
|
Requires(post): permissions
|
||||||
Requires(verify): permissions
|
Requires(verify): permissions
|
||||||
@ -153,8 +155,8 @@ The 'pop3d' daemon implements the Post Office Protocol Version 3 server.
|
|||||||
%package devel
|
%package devel
|
||||||
Summary: Development files for GNU Mailutils
|
Summary: Development files for GNU Mailutils
|
||||||
Group: Development/Libraries/C and C++
|
Group: Development/Libraries/C and C++
|
||||||
Requires: libmailutils%{somajor} == %{version}
|
Requires: libmailutils%{somajor} = %{version}
|
||||||
Requires: mailutils == %{version}
|
Requires: mailutils = %{version}
|
||||||
|
|
||||||
%description devel
|
%description devel
|
||||||
This package includes libraries and header files for building tools to
|
This package includes libraries and header files for building tools to
|
||||||
@ -174,6 +176,7 @@ implementations: UNIX mailbox, Maildir, MH, POP3, IMAP4, even SMTP.
|
|||||||
%setup -q
|
%setup -q
|
||||||
%patch0
|
%patch0
|
||||||
%patch2
|
%patch2
|
||||||
|
%patch4 -p1
|
||||||
set -- %(rpm -q --queryformat '%%{VERSION}' guile-devel | sed -r 's@\.@ @g')
|
set -- %(rpm -q --queryformat '%%{VERSION}' guile-devel | sed -r 's@\.@ @g')
|
||||||
(cat > guile.list)<<-EOF
|
(cat > guile.list)<<-EOF
|
||||||
%dir %{_datadir}/guile/site/$1.$2/
|
%dir %{_datadir}/guile/site/$1.$2/
|
||||||
@ -188,9 +191,9 @@ else
|
|||||||
echo Using guile $1.$2.$3
|
echo Using guile $1.$2.$3
|
||||||
mv libmu_scm libmu_scm-guile-2.2
|
mv libmu_scm libmu_scm-guile-2.2
|
||||||
mv include/mailutils/guile.h include/mailutils/guile-2.2.h
|
mv include/mailutils/guile.h include/mailutils/guile-2.2.h
|
||||||
tar xfJ %{S:1}
|
tar xfJ %{SOURCE1}
|
||||||
autoreconf -fiv
|
|
||||||
fi
|
fi
|
||||||
|
autoreconf -fiv
|
||||||
#
|
#
|
||||||
# Avoid build require for emacs as emacs does
|
# Avoid build require for emacs as emacs does
|
||||||
# build require one the sub packages herein!
|
# build require one the sub packages herein!
|
||||||
@ -329,7 +332,7 @@ ln -sf %{_mandir}/man1/mu-mail.1%{?ext_man} %{buildroot}%{_sysconfdir}/alternati
|
|||||||
|
|
||||||
%fdupes -s %{buildroot}%{_libexecdir}/python*/site-packages/mailutils/
|
%fdupes -s %{buildroot}%{_libexecdir}/python*/site-packages/mailutils/
|
||||||
|
|
||||||
%find_lang %name
|
%find_lang %{name}
|
||||||
|
|
||||||
%post
|
%post
|
||||||
%install_info --info-dir=%{_infodir} %{_infodir}/mailutils.info.gz
|
%install_info --info-dir=%{_infodir} %{_infodir}/mailutils.info.gz
|
||||||
@ -359,12 +362,11 @@ fi
|
|||||||
%verify_permissions %{_sbindir}/maidag
|
%verify_permissions %{_sbindir}/maidag
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%files -f %name.lang -f guile.list
|
%files -f %{name}.lang -f guile.list
|
||||||
%defattr(-,root,root)
|
|
||||||
%license COPYING COPYING.LESSER
|
%license COPYING COPYING.LESSER
|
||||||
%doc ChangeLog README NEWS AUTHORS THANKS
|
%doc ChangeLog README NEWS AUTHORS THANKS
|
||||||
%doc %{_infodir}/mailutils.info*.gz
|
%{_infodir}/mailutils.info*.gz
|
||||||
%doc %{_mandir}/man1/*.1%{?ext_man}
|
%{_mandir}/man1/*.1%{?ext_man}
|
||||||
%if %{with set_user_identity}
|
%if %{with set_user_identity}
|
||||||
%config %{_sysconfdir}/permissions.d/mailutils*
|
%config %{_sysconfdir}/permissions.d/mailutils*
|
||||||
%endif
|
%endif
|
||||||
@ -401,8 +403,8 @@ fi
|
|||||||
%{_libdir}/mailutils/*.so
|
%{_libdir}/mailutils/*.so
|
||||||
%dir %{_libdir}/python*/site-packages/mailutils/
|
%dir %{_libdir}/python*/site-packages/mailutils/
|
||||||
%{_libdir}/python*/site-packages/mailutils/c_api.so
|
%{_libdir}/python*/site-packages/mailutils/c_api.so
|
||||||
|
|
||||||
%files mh
|
%files mh
|
||||||
%defattr(-,root,root)
|
|
||||||
%dir %{_bindir}/mu-mh/
|
%dir %{_bindir}/mu-mh/
|
||||||
%{_bindir}/mu-mh/*
|
%{_bindir}/mu-mh/*
|
||||||
%{_datadir}/emacs/site-lisp/mailutils-mh.el
|
%{_datadir}/emacs/site-lisp/mailutils-mh.el
|
||||||
@ -412,29 +414,24 @@ fi
|
|||||||
|
|
||||||
%if %{with set_user_identity}
|
%if %{with set_user_identity}
|
||||||
%files delivery
|
%files delivery
|
||||||
%defattr(-,root,root)
|
|
||||||
%{_sbindir}/lmtpd
|
%{_sbindir}/lmtpd
|
||||||
%attr(04755,root,root) %verify(not mode) %{_sbindir}/mda
|
%attr(04755,root,root) %verify(not mode) %{_sbindir}/mda
|
||||||
%{_bindir}/putmail
|
%{_bindir}/putmail
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%files notify
|
%files notify
|
||||||
%defattr(-,root,root)
|
|
||||||
%{_sbindir}/comsatd
|
%{_sbindir}/comsatd
|
||||||
%doc %{_mandir}/man8/comsatd.8%{?ext_man}
|
%{_mandir}/man8/comsatd.8%{?ext_man}
|
||||||
|
|
||||||
%files imap4d
|
%files imap4d
|
||||||
%defattr(-,root,root)
|
|
||||||
%{_sbindir}/imap4d
|
%{_sbindir}/imap4d
|
||||||
%doc %{_mandir}/man8/imap4d.8%{?ext_man}
|
%{_mandir}/man8/imap4d.8%{?ext_man}
|
||||||
|
|
||||||
%files pop3d
|
%files pop3d
|
||||||
%defattr(-,root,root)
|
|
||||||
%{_sbindir}/pop3d
|
%{_sbindir}/pop3d
|
||||||
%doc %{_mandir}/man8/pop3d.8%{?ext_man}
|
%{_mandir}/man8/pop3d.8%{?ext_man}
|
||||||
|
|
||||||
%files devel
|
%files devel
|
||||||
%defattr(-,root,root)
|
|
||||||
%{_libdir}/*.so
|
%{_libdir}/*.so
|
||||||
%dir %{_includedir}/mailutils/
|
%dir %{_includedir}/mailutils/
|
||||||
%{_includedir}/mailutils/*.h
|
%{_includedir}/mailutils/*.h
|
||||||
@ -443,7 +440,6 @@ fi
|
|||||||
%{_datadir}/aclocal/mailutils.m4
|
%{_datadir}/aclocal/mailutils.m4
|
||||||
|
|
||||||
%files -n libmailutils%{somajor}
|
%files -n libmailutils%{somajor}
|
||||||
%defattr(-,root,root)
|
|
||||||
%{_libdir}/*.so.*
|
%{_libdir}/*.so.*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
11
python38-compat.patch
Normal file
11
python38-compat.patch
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
--- 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
|
Loading…
Reference in New Issue
Block a user