- build with guile 2.2

- rel 2

diff --git a/linux-gpib-guile2.patch b/linux-gpib-guile2.patch
index 427a252641512becfe9228c10cf7da81841b0e22..8d08324caab28e01ff263e64451ae9eaeedd57d4 100644 (file)
--- a/linux-gpib-guile2.patch
+++ b/linux-gpib-guile2.patch
@@ -1,13 +1,14 @@
 --- linux-gpib-4.0.3/configure.ac.orig 2016-04-09 15:34:55.000000000 +0200
 +++ linux-gpib-4.0.3/configure.ac      2016-07-06 17:55:18.567320365 +0200
-@@ -143,8 +143,10 @@
+@@ -143,8 +143,11 @@
  fi
  
  dnl Checks for libraries.
++AC_CHECK_LIB([guile-2.2],[scm_c_define],[:],[
 +AC_CHECK_LIB([guile-2.0],[scm_c_define],[:],[
  AC_CHECK_LIB([guile],[gh_define],[echo this prevents default actions from occurring > /dev/null],
        [BIND_GUILE="no";AC_MSG_NOTICE([libguile not found, disabling guile binding])],[])
-+])
++])])
  
  AC_CHECK_LIB([readline], [readline], 
             [readline_lib=yes;AC_SUBST([LIB_READLINE_LDFLAGS], ["-lreadline -lncurses"])],

diff --git a/linux-gpib.spec b/linux-gpib.spec
index 65cde524c7fa6635d2fdccd8101227cb06da08e7..305013d261edbf123de4111b2429985da2191287 100644 (file)
--- a/linux-gpib.spec
+++ b/linux-gpib.spec
@@ -33,7 +33,7 @@ exit 1
 %include       /usr/lib/rpm/macros.perl
 %define                php_name        php%{?php_suffix}
 
-%define                rel     1
+%define                rel     2
 %define                pname   linux-gpib
 Summary:       GPIB (IEEE 488) Linux support
 Summary(pl.UTF-8):     Obsługa GPIB (IEEE 488) dla Linuksa
@@ -293,7 +293,7 @@ cd linux-gpib-user-%{version}
 %{__autoheader}
 %{__automake}
 %if %{with guile}
-CPPFLAGS="%{rpmcppflags} -I/usr/include/guile/2.0"
+CPPFLAGS="%{rpmcppflags} -I/usr/include/guile/2.2"
 %endif
 %configure \
        %{?with_drivers_isa:--enable-isa} \