From f917254ce8cb515fb5d6be69319f84a766870a04189ef04a3e8754d963cef118 Mon Sep 17 00:00:00 2001
From: "Dr. Werner Fink" <werner@suse.com>
Date: Fri, 30 Nov 2018 08:42:09 +0000
Subject: [PATCH] Dynamic determine and use guile version in spec file

OBS-URL: https://build.opensuse.org/package/show/server:mail/mailutils?expand=0&rev=19
---
 mailutils.changes |  5 +++++
 mailutils.spec    | 54 +++++++++++++++++++++++------------------------
 2 files changed, 31 insertions(+), 28 deletions(-)

diff --git a/mailutils.changes b/mailutils.changes
index 08de4a2..fef580a 100644
--- a/mailutils.changes
+++ b/mailutils.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Nov 30 08:41:21 UTC 2018 - Dr. Werner Fink <werner@suse.de>
+
+- Dynamic determine and use guile version in spec file 
+
 -------------------------------------------------------------------
 Wed Nov 21 10:32:35 UTC 2018 - Dr. Werner Fink <werner@suse.de>
 
diff --git a/mailutils.spec b/mailutils.spec
index ab264d5..4cae6ad 100644
--- a/mailutils.spec
+++ b/mailutils.spec
@@ -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 @@ Source2:        %{name}-rpmlintrc
 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:  openldap2-devel
 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:  pkgconfig(python)
 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,28 @@ implementations: UNIX mailbox, Maildir, MH, POP3, IMAP4, even SMTP.
 %setup -q
 %patch0
 %patch2
-%if %{without guile_22}
+set -- %(rpm -q --queryformat '%%{VERSION}' guile-devel | sed -r 's@\.@ @g')
+if test $1 -gt 2 -o \( $1 -eq 2 -a $2 -ge 2 \)
+then
+ echo Using guile $1.$2.$3
+ (cat > guile.list)<<-'EOF'
+	%dir %{_datadir}/guile/site/2.2/
+	%dir %{_datadir}/guile/site/2.2/mailutils/
+	%{_datadir}/guile/site/2.2/mailutils/*
+	EOF
+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
+ (cat > guile.list)<<-'EOF'
+	%dir %{_datadir}/guile/site/2.0/
+	%dir %{_datadir}/guile/site/2.0/mailutils/
+	%{_datadir}/guile/site/2.0/mailutils/*
+	EOF
+ 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 +368,7 @@ fi
 %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 +408,6 @@ fi
 %{_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)