rpms/kdeedu/devel kdeedu-4.0.2-openbabel.patch, NONE, 1.1 kdeedu.spec, 1.86, 1.87

[Kevin Kofler (kkofler)]

Author: kkofler

Update of /cvs/pkgs/rpms/kdeedu/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29263/devel

Modified Files:
	kdeedu.spec 
Added Files:
	kdeedu-4.0.2-openbabel.patch 
Log Message:
Fix linking against OpenBabel.

kdeedu-4.0.2-openbabel.patch:

--- NEW FILE kdeedu-4.0.2-openbabel.patch ---
diff -ur kdeedu-4.0.2/kalzium/src/CMakeLists.txt kdeedu-4.0.2-openbabel/kalzium/src/CMakeLists.txt
--- kdeedu-4.0.2/kalzium/src/CMakeLists.txt	2008-01-31 00:53:33.000000000 +0100
+++ kdeedu-4.0.2-openbabel/kalzium/src/CMakeLists.txt	2008-03-07 17:29:17.000000000 +0100
@@ -108,9 +108,12 @@
 target_link_libraries(kalzium ${KDE4_KHTML_LIBRARY} ${KDE4_KUTILS_LIBRARY} science kdeeduui )
 
 
-if (OPENBABEL2_FOUND AND OPENGL_FOUND AND EIGEN_FOUND)
-    target_link_libraries(kalzium ${OPENBABEL2_LIBRARIES} ${QT_QTOPENGL_LIBRARY} compoundviewer avogadro-kalzium)
-endif (OPENBABEL2_FOUND AND OPENGL_FOUND AND EIGEN_FOUND)
+if (OPENBABEL2_FOUND)
+    target_link_libraries(kalzium ${OPENBABEL2_LIBRARIES})
+    if (OPENGL_FOUND AND EIGEN_FOUND)
+        target_link_libraries(kalzium ${QT_QTOPENGL_LIBRARY} compoundviewer avogadro-kalzium)
+    endif (OPENGL_FOUND AND EIGEN_FOUND)
+endif (OPENBABEL2_FOUND)
 
 if(LIBFACILE_FOUND)
    link_directories (${OCAMLC_DIR})


Index: kdeedu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/devel/kdeedu.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- kdeedu.spec	7 Mar 2008 16:06:39 -0000	1.86
+++ kdeedu.spec	7 Mar 2008 16:32:08 -0000	1.87
@@ -7,6 +7,8 @@
 Group:	 Amusements/Games
 URL:     http://www.kde.org/
 Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdeedu-%{version}.tar.bz2
+# fix linking against OpenBabel
+Patch0:  kdeedu-4.0.2-openbabel.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # http://bugzilla.redhat.com/371121
@@ -94,6 +96,7 @@
 
 %prep
 %setup -q -n kdeedu-%{version}
+%patch0 -p1 -b .openbabel
 
 
 %build
@@ -161,7 +164,7 @@
 
 %changelog
 * Fri Mar 07 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.2-2
-- reenable BR openbabel-devel
+- reenable BR openbabel-devel, fix build with it
 - add BR gpsd-devel (for marble), libnova-devel (for KStars)
 
 * Thu Feb 28 2008 Than Ngo <than at redhat.com> 4.0.2-1