packages: libmatheval/libmatheval.spec, libmatheval/libmatheval-guile2.patc...

[qboosh]

Author: qboosh                       Date: Sun Jul 24 12:02:50 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 1.1.8
- added guile2 patch to fix build with guile 2.0

---- Files affected:
packages/libmatheval:
   libmatheval.spec (1.15 -> 1.16) , libmatheval-guile2.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/libmatheval/libmatheval.spec
diff -u packages/libmatheval/libmatheval.spec:1.15 packages/libmatheval/libmatheval.spec:1.16
--- packages/libmatheval/libmatheval.spec:1.15	Tue Apr  1 22:45:53 2008
+++ packages/libmatheval/libmatheval.spec	Sun Jul 24 14:02:45 2011
@@ -2,18 +2,23 @@
 Summary:	Library for evaluating mathematical expressions
 Summary(pl.UTF-8):	Biblioteka do obliczania wyrażeń matematycznych
 Name:		libmatheval
-Version:	1.1.7
+Version:	1.1.8
 Release:	1
 License:	GPL v3+
 Group:		Libraries
 Source0:	http://ftp.gnu.org/gnu/libmatheval/%{name}-%{version}.tar.gz
-# Source0-md5:	e834271873b73316b92f45b02ad237aa
+# Source0-md5:	02da702f933a9d6554e27d1b33a89b60
 Patch0:		%{name}-info.patch
+Patch1:		%{name}-guile2.patch
 URL:		http://www.gnu.org/software/libmatheval/
+BuildRequires:	autoconf >= 2.53
 BuildRequires:	automake
 BuildRequires:	bison
 BuildRequires:	flex >= 2.5.33-2
+# for config.rpath
+BuildRequires:	gettext-devel
 BuildRequires:	guile-devel
+BuildRequires:	libtool
 BuildRequires:	texinfo
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -65,9 +70,15 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
-cp -f /usr/share/automake/config.* config
+cp -f /usr/share/gettext/config.rpath config
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__autoheader}
+%{__automake}
 %configure
 %{__make}
 
@@ -113,6 +124,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.16  2011/07/24 12:02:45  qboosh
+- updated to 1.1.8
+- added guile2 patch to fix build with guile 2.0
+
 Revision 1.15  2008/04/01 20:45:53  qboosh
 - updated to 1.1.7
 

================================================================
Index: packages/libmatheval/libmatheval-guile2.patch
diff -u /dev/null packages/libmatheval/libmatheval-guile2.patch:1.1
--- /dev/null	Sun Jul 24 14:02:50 2011
+++ packages/libmatheval/libmatheval-guile2.patch	Sun Jul 24 14:02:45 2011
@@ -0,0 +1,22 @@
+--- libmatheval-1.1.8/configure.in.orig	2011-07-03 11:45:51.000000000 +0200
++++ libmatheval-1.1.8/configure.in	2011-07-24 11:04:05.799093788 +0200
+@@ -60,10 +60,16 @@
+ AC_CHECK_FUNCS([bzero memset], [break])
+ 
+ dnl Additional Guile feature checks.
++save_CPPFLAGS="$CPPFLAGS"
++save_LIBS="$LIBS"
++CPPFLAGS="$CPPFLAGS $GUILE_CFLAGS"
++LIBS="$LIBS $GUILE_LDFLAGS"
+ AC_CHECK_TYPE([scm_t_bits], [AC_DEFINE([HAVE_SCM_T_BITS], [1], [Define to 1 if you have the `scm_t_bits' type.])], [], [#include <libguile.h>])
+-AC_CHECK_LIB([guile], [scm_c_define_gsubr], [AC_DEFINE([HAVE_SCM_C_DEFINE_GSUBR], [1], [Define to 1 if you have the `scm_c_define_gsubr' function.])], [], [$GUILE_LDFLAGS])
+-AC_CHECK_LIB([guile], [scm_make_gsubr], [AC_DEFINE([HAVE_SCM_MAKE_GSUBR], [1], [Define to 1 if you have the `scm_make_gsubr' function.])], [], [$GUILE_LDFLAGS])
+-AC_CHECK_LIB([guile], [scm_num2dbl], [AC_DEFINE([HAVE_SCM_NUM2DBL], [1], [Define to 1 if you have the `scm_num2dbl' function.])], [], [$GUILE_LDFLAGS])
++AC_CHECK_FUNC([scm_c_define_gsubr], [AC_DEFINE([HAVE_SCM_C_DEFINE_GSUBR], [1], [Define to 1 if you have the `scm_c_define_gsubr' function.])], [])
++AC_CHECK_FUNC([scm_make_gsubr], [AC_DEFINE([HAVE_SCM_MAKE_GSUBR], [1], [Define to 1 if you have the `scm_make_gsubr' function.])], [])
++AC_CHECK_FUNC([scm_num2dbl], [AC_DEFINE([HAVE_SCM_NUM2DBL], [1], [Define to 1 if you have the `scm_num2dbl' function.])], [])
++LIBS="$save_LIBS"
++CPPFLAGS="$save_CPPFLAGS"
+ 
+ AC_CONFIG_FILES([Makefile doc/Makefile lib/Makefile])
+ AC_OUTPUT(libmatheval.pc)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libmatheval/libmatheval.spec?r1=1.15&r2=1.16&f=u