rpms/libqalculate/devel libqalculate-cln12.patch, 1.1, 1.2 libqalculate.spec, 1.22, 1.23

[Deji Akingunola (deji)]

Author: deji

Update of /cvs/extras/rpms/libqalculate/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29912

Modified Files:
	libqalculate-cln12.patch libqalculate.spec 
Log Message:
Fix the cln-1.2 patch


libqalculate-cln12.patch:

Index: libqalculate-cln12.patch
===================================================================
RCS file: /cvs/extras/rpms/libqalculate/devel/libqalculate-cln12.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libqalculate-cln12.patch	27 Feb 2008 20:28:11 -0000	1.1
+++ libqalculate-cln12.patch	28 Feb 2008 03:30:29 -0000	1.2
@@ -1,5 +1,5 @@
 --- configure.in	2007-05-18 04:08:26.000000000 -0400
-+++ configure.in.new	2008-02-27 14:42:21.000000000 -0500
++++ configure.in.new	2008-02-27 13:12:17.000000000 -0500
 @@ -91,13 +91,6 @@
  
  AC_LANG([C++])
@@ -14,7 +14,7 @@
  PKG_CHECK_MODULES(GLIB, [
  	glib-2.0
  	libxml-2.0 >= 2.3.8
-@@ -105,6 +98,21 @@
+@@ -105,6 +98,17 @@
  AC_SUBST(GLIB_CFLAGS)
  AC_SUBST(GLIB_LIBS)
  
@@ -24,42 +24,30 @@
 +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.]))
++   AC_DEFINE(HAVE_RECENT_CLN, 1, [Define if CLN can be used])
++   LIBS="$LIBS $CLN_LIBS"
++   CPPFLAGS="$CPPFLAGS $CLN_CPPFLAGS"
 +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 @@
++++ libqalculate/Number.cc.new	2008-02-27 12:54:20.000000000 -0500
+@@ -28,6 +28,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 @@
+@@ -36,7 +37,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) {
+ 		if(!zerop(integ) && integ < 10000 && integ > -10000) {


Index: libqalculate.spec
===================================================================
RCS file: /cvs/extras/rpms/libqalculate/devel/libqalculate.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- libqalculate.spec	27 Feb 2008 21:27:07 -0000	1.22
+++ libqalculate.spec	28 Feb 2008 03:30:29 -0000	1.23
@@ -12,7 +12,7 @@
 BuildRequires:	glib2-devel, cln-devel
 BuildRequires:	libxml2-devel
 BuildRequires:	readline-devel, ncurses-devel
-BuildRequires:	perl(XML::Parser), gettext, pkgconfig
+BuildRequires:	perl(XML::Parser), gettext
 BuildRequires:	intltool, libtool, automake, autoconf
 
 %description
@@ -52,7 +52,7 @@
 libtoolize --force --copy
 aclocal
 autoheader
-automake  --add-missing --gnu
+automake
 autoconf
 %configure --disable-static
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool