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

[Deji Akingunola (deji)]

Author: deji

Update of /cvs/extras/rpms/qalculate-gtk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30162

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


qalculate-gtk-cln12.patch:

Index: qalculate-gtk-cln12.patch
===================================================================
RCS file: /cvs/extras/rpms/qalculate-gtk/devel/qalculate-gtk-cln12.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- qalculate-gtk-cln12.patch	27 Feb 2008 20:31:28 -0000	1.1
+++ qalculate-gtk-cln12.patch	28 Feb 2008 03:34:50 -0000	1.2
@@ -1,5 +1,5 @@
 --- configure.in	2007-05-18 04:36:10.000000000 -0400
-+++ configure.in.new	2008-02-27 15:13:34.000000000 -0500
++++ configure.in.new	2008-02-27 22:21:18.000000000 -0500
 @@ -63,12 +63,6 @@
  
  AC_LANG([C++])
@@ -13,7 +13,7 @@
  PKG_CHECK_MODULES(GLIB, [
  	glib-2.0 >= 2.4
  	libxml-2.0
-@@ -95,6 +89,21 @@
+@@ -95,6 +89,17 @@
  AC_SUBST(QALCULATE_CFLAGS)
  AC_SUBST(QALCULATE_LIBS)
  
@@ -24,13 +24,9 @@
 +
 +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.]))
++   LIBS="$LIBS $CLN_LIBS"
++   CPPFLAGS="$CPPFLAGS $CLN_CPPFLAGS"
 +fi
-+LIBS="$LIBS $CLN_LIBS"
-+CPPFLAGS="$CPPFLAGS $CLN_CPPFLAGS"
 +
  LIBGNOME_REQUIRED=2.0.0
  


Index: qalculate-gtk.spec
===================================================================
RCS file: /cvs/extras/rpms/qalculate-gtk/devel/qalculate-gtk.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- qalculate-gtk.spec	27 Feb 2008 21:29:16 -0000	1.22
+++ qalculate-gtk.spec	28 Feb 2008 03:34:50 -0000	1.23
@@ -34,7 +34,7 @@
 libtoolize --force --copy
 aclocal
 autoheader
-automake --add-missing --gnu
+automake
 autoconf
 %configure 
 make %{?_smp_mflags}