Hello community, here is the log from the commit of package mailutils for openSUSE:Factory checked in at 2018-12-05 09:37:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mailutils (Old) and /work/SRC/openSUSE:Factory/.mailutils.new.19453 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mailutils" Wed Dec 5 09:37:25 2018 rev:4 rq:652824 version:3.5 Changes: -------- --- /work/SRC/openSUSE:Factory/mailutils/mailutils.changes 2018-11-26 10:14:17.514155283 +0100 +++ /work/SRC/openSUSE:Factory/.mailutils.new.19453/mailutils.changes 2018-12-05 09:37:32.065089858 +0100 @@ -1,0 +2,5 @@ +Fri Nov 30 08:41:21 UTC 2018 - Dr. Werner Fink <wer...@suse.de> + +- Dynamic determine and use guile version in spec file + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mailutils.spec ++++++ --- /var/tmp/diff_new_pack.TEhwqh/_old 2018-12-05 09:37:33.033088798 +0100 +++ /var/tmp/diff_new_pack.TEhwqh/_new 2018-12-05 09:37:33.037088794 +0100 @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -36,21 +36,20 @@ Patch0: lisp-load-silent.patch Patch2: silent-rpmlint-with_initgroups.patch Patch3: mailutils-3.5-guile-2.0.patch -%if %{without guile_22} BuildRequires: autoconf BuildRequires: automake -BuildRequires: libtool -%endif BuildRequires: bison BuildRequires: cpio 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: m4 @@ -59,11 +58,6 @@ BuildRequires: pam-devel BuildRequires: pkgconfig(fribidi) BuildRequires: pkgconfig(gnutls) -%if %{with guile_22} -BuildRequires: pkgconfig(guile-2.2) -%else -BuildRequires: pkgconfig(guile-2.0) -%endif BuildRequires: pkgconfig(krb5-gssapi) BuildRequires: pkgconfig(kyotocabinet) BuildRequires: pkgconfig(libgsasl) @@ -76,9 +70,7 @@ BuildRequires: readline-devel BuildRequires: tcpd-devel BuildRequires: update-alternatives -%if %{with guile_22} -Requires: /usr/bin/guile -%endif +Requires: guile = %(rpm -q --queryformat '%%{VERSION}' guile-devel) Requires(post): update-alternatives Requires(preun): update-alternatives Requires(post): %install_info_prereq @@ -186,13 +178,23 @@ %setup -q %patch0 %patch2 -%if %{without guile_22} +set -- %(rpm -q --queryformat '%%{VERSION}' guile-devel | sed -r 's@\.@ @g') +(cat > guile.list)<<-EOF + %dir %{_datadir}/guile/site/$1.$2/ + %dir %{_datadir}/guile/site/$1.$2/mailutils/ + %{_datadir}/guile/site/$1.$2/mailutils/* + EOF +if test $1 -gt 2 -o \( $1 -eq 2 -a $2 -ge 2 \) +then + echo Using guile $1.$2.$3 +else %patch3 -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 -%endif + 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 +fi # # Avoid build require for emacs as emacs does # build require one the sub packages herein! @@ -361,7 +363,7 @@ %verify_permissions %{_sbindir}/maidag %endif -%files -f %name.lang +%files -f %name.lang -f guile.list %defattr(-,root,root) %license COPYING COPYING.LESSER %doc ChangeLog README NEWS AUTHORS THANKS @@ -401,15 +403,6 @@ %{_libdir}/mailutils/*.so %dir %{_libdir}/python*/site-packages/mailutils/ %{_libdir}/python*/site-packages/mailutils/c_api.so -%if %{with guile_22} -%dir %{_datadir}/guile/site/2.2/ -%dir %{_datadir}/guile/site/2.2/mailutils/ -%{_datadir}/guile/site/2.2/mailutils/* -%else -%dir %{_datadir}/guile/site/2.0/ -%dir %{_datadir}/guile/site/2.0/mailutils/ -%{_datadir}/guile/site/2.0/mailutils/* -%endif %files mh %defattr(-,root,root)
