rpms/qalculate-gtk/devel qalculate-gtk-cln12.patch, NONE, 1.1 qalculate-gtk.spec, 1.19, 1.20

[Deji Akingunola (deji)]

Author: deji

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

Modified Files:
	qalculate-gtk.spec 
Added Files:
	qalculate-gtk-cln12.patch 
Log Message:
* Wed Feb 27 2008 Deji Akingunola <dakingun at gmail.com> - 0.9.6-4
- Rebuild (with patch) for cln-1.2


qalculate-gtk-cln12.patch:

--- NEW FILE qalculate-gtk-cln12.patch ---
--- configure.in	2007-05-18 04:36:10.000000000 -0400
+++ configure.in.new	2008-02-27 15:13:34.000000000 -0500
@@ -63,12 +63,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 >= 2.4
 	libxml-2.0
@@ -95,6 +89,21 @@
 AC_SUBST(QALCULATE_CFLAGS)
 AC_SUBST(QALCULATE_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"
+
 LIBGNOME_REQUIRED=2.0.0
 
 USE_LIBGNOME="auto"


Index: qalculate-gtk.spec
===================================================================
RCS file: /cvs/extras/rpms/qalculate-gtk/devel/qalculate-gtk.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- qalculate-gtk.spec	11 Feb 2008 03:27:25 -0000	1.19
+++ qalculate-gtk.spec	27 Feb 2008 20:31:28 -0000	1.20
@@ -1,12 +1,13 @@
 Summary:	A multi-purpose desktop calculator for GNU/Linux
 Name:		qalculate-gtk
 Version:	0.9.6
-Release:	3%{?dist}
+Release:	4%{?dist}
 License:	GPLv2+
 Group:		Applications/Engineering
 URL:		http://qalculate.sourceforge.net/
 Source:		http://dl.sf.net/qalculate/qalculate-gtk-%{version}.tar.gz
 Patch0:		qalculate-gtk-desktop.patch
+Patch1:		qalculate-gtk-cln12.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	libgnome-devel, libglade2-devel, libgnomeui-devel
 BuildRequires:	libqalculate-devel
@@ -25,6 +26,7 @@
 %prep
 %setup -q
 %patch0 -p0 -b .desktop
+%patch1 -p0 -b .cln
 
 %build
 %configure 
@@ -64,6 +66,9 @@
 %{_datadir}/qalculate-gtk/
 
 %changelog
+* Wed Feb 27 2008 Deji Akingunola <dakingun at gmail.com> - 0.9.6-4
+- Rebuild (with patch) for cln-1.2
+
 * Sun Feb 10 2008 Deji Akingunola <dakingun at gmail.com> - 0.9.6-3
 - Rebuild for gcc43