rpms/qalculate-kde/devel qalculate-kde-cln12.patch, NONE, 1.1 qalculate-kde.spec, 1.18, 1.19

[Deji Akingunola (deji)]

Author: deji

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

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


qalculate-kde-cln12.patch:

--- NEW FILE qalculate-kde-cln12.patch ---
--- configure.in.in	2007-05-18 04:10:17.000000000 -0400
+++ configure.in.in.new	2008-02-27 23:15:23.000000000 -0500
@@ -8,12 +8,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(QALCULATE, [
 	libxml-2.0
 	glib-2.0
@@ -25,4 +19,15 @@
 LIBS="$LIBS $QALCULATE_LIBS"
 CFLAGS="$CFLAGS $QALCULATE_CFLAGS"
 CPPFLAGS="$CPPFLAGS $QALCULATE_CFLAGS"
+ 
+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])
+   LIBS="$LIBS $CLN_LIBS"
+   CPPFLAGS="$CPPFLAGS $CLN_CPPFLAGS"
+fi
 
--- configure.in	2007-06-17 07:33:58.000000000 -0400
+++ configure.in.new	2008-02-27 23:16:22.000000000 -0500
@@ -91,6 +91,17 @@
 CFLAGS="$CFLAGS $QALCULATE_CFLAGS"
 CPPFLAGS="$CPPFLAGS $QALCULATE_CFLAGS"
 
+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])
+   LIBS="$LIBS $CLN_LIBS"
+   CPPFLAGS="$CPPFLAGS $CLN_CPPFLAGS"
+fi
+
 KDE_CREATE_SUBDIRSLIST
 AC_CONFIG_FILES([ Makefile ])
 AC_CONFIG_FILES([ doc/Makefile ])


Index: qalculate-kde.spec
===================================================================
RCS file: /cvs/extras/rpms/qalculate-kde/devel/qalculate-kde.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- qalculate-kde.spec	11 Feb 2008 03:34:17 -0000	1.18
+++ qalculate-kde.spec	28 Feb 2008 04:39:25 -0000	1.19
@@ -1,15 +1,16 @@
 Summary:	A multi-purpose desktop calculator for GNU/Linux
 Name:		qalculate-kde
 Version:	0.9.6
-Release:	4%{?dist}
+Release:	5%{?dist}
 License:	GPLv2+
 Group:		Applications/Engineering
 URL:		http://qalculate.sourceforge.net/
 Source0:	http://dl.sf.net/qalculate/qalculate-kde-%{version}.tar.gz
 Patch0:		qalculate_kde-desktop.patch
+Patch1:		qalculate-kde-cln12.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	libqalculate-devel, kdelibs3-devel, gettext
-BuildRequires:	automake16, autoconf
+BuildRequires:	automake16, autoconf, automake, intltool, libtool, pkgconfig
 Requires:	gnuplot
 
 %description
@@ -22,8 +23,10 @@
 %prep
 %setup -q 
 %patch0 -p0 -b .desktop
+%patch1 -p0 -b .cln
 
 %build
+make -f admin/Makefile.common dist
 unset QTDIR || : ; . %{_sysconfdir}/profile.d/qt.sh
 export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include
 %configure --disable-rpath
@@ -71,6 +74,9 @@
 %{_datadir}/icons/hicolor/*/actions/*
 
 %changelog
+* Wed Feb 27 2008 Deji Akingunola <dakingun at gmail.com> - 0.9.6-5
+- Rebuild for cln-1.2
+
 * Sun Feb 10 2008 Deji Akingunola <dakingun at gmail.com> - 0.9.6-4
 - Rebuild for gcc43