Accepting request 508011 from home:scarabeus_iv:branches:Base:System

- Add patch to build with guile 2.2:
  * autogen-guile-2.2.patch

OBS-URL: https://build.opensuse.org/request/show/508011
OBS-URL: https://build.opensuse.org/package/show/Base:System/autogen?expand=0&rev=54

autogen-guile-2.2.patch

@@ -0,0 +1,48 @@
+Index: autogen-5.18.12/agen5/guile-iface.h
+===================================================================
+--- autogen-5.18.12.orig/agen5/guile-iface.h
++++ autogen-5.18.12/agen5/guile-iface.h
+@@ -9,16 +9,13 @@
+ # error AutoGen does not work with this version of Guile
+   choke me.
+ 
+-#elif GUILE_VERSION < 201000
++#else
+ # define AG_SCM_IS_PROC(_p)           scm_is_true( scm_procedure_p(_p))
+ # define AG_SCM_LIST_P(_l)            scm_is_true( scm_list_p(_l))
+ # define AG_SCM_PAIR_P(_p)            scm_is_true( scm_pair_p(_p))
+ # define AG_SCM_TO_LONG(_v)           scm_to_long(_v)
+ # define AG_SCM_TO_ULONG(_v)          ((unsigned long)scm_to_ulong(_v))
+ 
+-#else
+-# error unknown GUILE_VERSION
+-  choke me.
+ #endif
+ 
+ #endif /* MUTATING_GUILE_IFACE_H_GUARD */
+Index: autogen-5.18.12/configure
+===================================================================
+--- autogen-5.18.12.orig/configure
++++ autogen-5.18.12/configure
+@@ -14198,7 +14198,7 @@ $as_echo "no" >&6; }
+ 		PKG_CONFIG=""
+ 	fi
+ fi
+-  _guile_versions_to_search="2.0 1.8"
++  _guile_versions_to_search="2.2 2.0 1.8"
+   if test -n "$GUILE_EFFECTIVE_VERSION"; then
+     _guile_tmp=""
+     for v in $_guile_versions_to_search; do
+Index: autogen-5.18.12/config/guile.m4
+===================================================================
+--- autogen-5.18.12.orig/config/guile.m4
++++ autogen-5.18.12/config/guile.m4
+@@ -61,7 +61,7 @@
+ #
+ AC_DEFUN([GUILE_PKG],
+  [PKG_PROG_PKG_CONFIG
+-  _guile_versions_to_search="m4_default([$1], [2.0 1.8])"
++  _guile_versions_to_search="m4_default([$1], [2.2 2.0 1.8])"
+   if test -n "$GUILE_EFFECTIVE_VERSION"; then
+     _guile_tmp=""
+     for v in $_guile_versions_to_search; do

autogen.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Jul  4 08:45:03 UTC 2017 - tchvatal@suse.com
+
+- Add patch to build with guile 2.2:
+  * autogen-guile-2.2.patch
+
 -------------------------------------------------------------------
 Wed Feb 22 14:28:17 UTC 2017 - bwiedemann@suse.com
 

autogen.spec

@@ -23,13 +23,15 @@ Release:        0
 Summary:        Automated Text File Generator
 License:        GPL-3.0+
 Group:          Development/Tools/Building
-Url:            http://autogen.sourceforge.net/
+Url:            https://www.gnu.org/software/autogen/
 Source0:        https://ftp.gnu.org/gnu/autogen/rel%{version}/%{name}-%{version}.tar.xz
 Source1:        https://ftp.gnu.org/gnu/autogen/rel%{version}/%{name}-%{version}.tar.xz.sig
 Source2:        http://savannah.gnu.org/project/memberlist-gpgkeys.php?group=autogen&download=1#/%{name}.keyring
 Patch1:         autogen-build_ldpath.patch
 # PATCH-FIX-UPSTREAM -- https://savannah.gnu.org/support/index.php?109234 boo#1021353
 Patch2:         autogen-catch-race-error.patch
+# PATCH-FIX-UPSTREAM -- guile 2.2 support
+Patch3:         autogen-guile-2.2.patch
 BuildRequires:  fdupes
 BuildRequires:  guile-devel
 BuildRequires:  libtool
@@ -83,6 +85,7 @@ This package contains devel files for libopts
 %setup -q
 %patch1
 %patch2 -p1
+%patch3 -p1
 
 %build
 %configure \