From 1bc70bf521f13c4c8b79a72031ab1e94d28fc4db Mon Sep 17 00:00:00 2001
From: Deji Akingunola <deji@fedoraproject.org>
Date: Wed, 27 Feb 2008 20:28:11 +0000
Subject: [PATCH] - Rebuild (with patch) for cln-1.2

---
 libqalculate-cln12.patch | 65 ++++++++++++++++++++++++++++++++++++++++
 libqalculate.spec        |  7 ++++-
 2 files changed, 71 insertions(+), 1 deletion(-)
 create mode 100644 libqalculate-cln12.patch

diff --git a/libqalculate-cln12.patch b/libqalculate-cln12.patch
new file mode 100644
index 0000000..137e5e4
--- /dev/null
+++ b/libqalculate-cln12.patch
@@ -0,0 +1,65 @@
+--- configure.in	2007-05-18 04:08:26.000000000 -0400
++++ configure.in.new	2008-02-27 14:42:21.000000000 -0500
+@@ -91,13 +91,6 @@
+ 
+ AC_LANG([C++])
+ 
+-AC_PATH_CLN(1.1.0, [
+-     	LIBS="$LIBS $CLN_LIBS"
+-     	CPPFLAGS="$CPPFLAGS $CLN_CPPFLAGS"
+-  	AC_DEFINE(HAVE_LIBCLN,1,[If CLN can be used])
+-], AC_MSG_ERROR([No suitable installed version of CLN could be found.]))
+-
+-
+ PKG_CHECK_MODULES(GLIB, [
+ 	glib-2.0
+ 	libxml-2.0 >= 2.3.8
+@@ -105,6 +98,21 @@
+ AC_SUBST(GLIB_CFLAGS)
+ AC_SUBST(GLIB_LIBS)
+ 
++PKG_CHECK_MODULES(CLN, [ cln >= 1.2 ],
++                  [have_recent_cln=yes], [have_recent_cln=no])
++AC_SUBST(CLN_CPPFLAGS)
++AC_SUBST(CLN_LIBS)
++
++if test "$have_recent_cln" = "yes" ; then
++   AC_DEFINE(HAVE_LIBCLN12, 1, [Define if CLN can be used])
++else
++   AC_PATH_CLN(1.1.0, [
++  	AC_DEFINE(HAVE_LIBCLN11,1,[If CLN can be used])
++   ], AC_MSG_ERROR([No suitable installed version of CLN could be found.]))
++fi
++LIBS="$LIBS $CLN_LIBS"
++CPPFLAGS="$CPPFLAGS $CLN_CPPFLAGS"
++
+ dnl  --------------------------------
+ dnl | check for readline            |-----------------------------------------
+ dnl  --------------------------------
+--- libqalculate/Number.cc	2007-05-18 04:03:22.000000000 -0400
++++ libqalculate/Number.cc.new	2008-02-27 14:56:11.000000000 -0500
+@@ -9,6 +9,8 @@
+     (at your option) any later version.
+ */
+ 
++#include "config.h"
++
+ #include "support.h"
+ 
+ #include "Number.h"
+@@ -28,6 +30,7 @@
+ 
+ using namespace cln;
+ 
++#ifdef HAVE_LIBCLN11
+ void cln::cl_abort() {
+ 	CALCULATOR->error(true, "CLN Error: see terminal output (probably too large or small floating point number)", NULL);
+ 	if(CALCULATOR->busy()) {
+@@ -36,6 +39,7 @@
+ 		exit(0);
+ 	}
+ }
++#endif
+ 
+ string printCL_I(cl_I integ, int base = 10, bool display_sign = true, BaseDisplay base_display = BASE_DISPLAY_NORMAL, bool lower_case = false) {
+ 	if(base == BASE_ROMAN_NUMERALS) {
diff --git a/libqalculate.spec b/libqalculate.spec
index 8a0fa5b..c2b0486 100644
--- a/libqalculate.spec
+++ b/libqalculate.spec
@@ -1,12 +1,13 @@
 Summary:	Multi-purpose calculator library
 Name:		libqalculate
 Version:	0.9.6
-Release:	3%{?dist}
+Release:	4%{?dist}
 License:	GPLv2+
 Group:		System Environment/Libraries
 URL:		http://qalculate.sourceforge.net/
 Source0:	http://dl.sf.net/sourceforge/qalculate/%{name}-%{version}.tar.gz
 Patch0:		libqalculate-gcc43.patch
+Patch1:		libqalculate-cln12.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	glib2-devel, cln-devel
 BuildRequires:	libxml2-devel
@@ -43,6 +44,7 @@ frontends are provided by qalculate-gtk and qalculate-kde packages resp.
 %prep
 %setup -q
 %patch0 -p0 -b .gcc43
+%patch1 -p0 -b .cln
 
 %build
 %configure --disable-static
@@ -80,6 +82,9 @@ rm -rf %{buildroot}
 %{_bindir}/qalc
 
 %changelog
+* Wed Feb 27 2008 Deji Akingunola <dakingun@gmail.com> - 0.9.6-4
+- Rebuild (with patch) for cln-1.2
+
 * Sun Feb 10 2008 Deji Akingunola <dakingun@gmail.com> - 0.9.6-3
 - Rebuild for gcc43