rpms/kdeedu/devel kdeedu-4.0.2-cfitsio.patch, NONE, 1.1 kdeedu.spec, 1.87, 1.88

[Kevin Kofler (kkofler)]

Author: kkofler

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

Modified Files:
	kdeedu.spec 
Added Files:
	kdeedu-4.0.2-cfitsio.patch 
Log Message:
* Fri Mar 07 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.2-3
- fix cfitsio detection by using pkgconfig

kdeedu-4.0.2-cfitsio.patch:

--- NEW FILE kdeedu-4.0.2-cfitsio.patch ---
diff -ur kdeedu-4.0.2/cmake/modules/FindCFitsio.cmake kdeedu-4.0.2-cfitsio/cmake/modules/FindCFitsio.cmake
--- kdeedu-4.0.2/cmake/modules/FindCFitsio.cmake	2008-01-05 00:56:03.000000000 +0100
+++ kdeedu-4.0.2-cfitsio/cmake/modules/FindCFitsio.cmake	2008-03-07 20:07:07.000000000 +0100
@@ -20,13 +20,22 @@
 
 else (CFITSIO_INCLUDE_DIR AND CFITSIO_LIBRARIES)
 
+  IF (NOT WIN32)
+    # use pkg-config to get the directories and then use these values
+    # in the FIND_PATH() and FIND_LIBRARY() calls
+    INCLUDE(UsePkgConfig)
+    PKGCONFIG(cfitsio _CFitsioIncDir _CFitsioLinkDir _CFitsioLinkFlags _CFitsioCflags)
+  ENDIF (NOT WIN32)
+
   find_path(CFITSIO_INCLUDE_DIR fitsio.h
+    ${_CFitsioIncDir}
     ${_obIncDir}
     ${GNUWIN32_DIR}/include
   )
 
   find_library(CFITSIO_LIBRARIES NAMES cfitsio
     PATHS
+    ${_CFitsioLinkDir}
     ${_obLinkDir}
     ${GNUWIN32_DIR}/lib
   )


Index: kdeedu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/devel/kdeedu.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- kdeedu.spec	7 Mar 2008 16:32:08 -0000	1.87
+++ kdeedu.spec	7 Mar 2008 19:10:14 -0000	1.88
@@ -1,7 +1,7 @@
 Name:    kdeedu
 Summary: Educational/Edutainment applications 
 Version: 4.0.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPLv2
 Group:	 Amusements/Games
@@ -9,6 +9,8 @@
 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
+# fix cfitsio detection by using pkgconfig
+Patch1:  kdeedu-4.0.2-cfitsio.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # http://bugzilla.redhat.com/371121
@@ -97,6 +99,7 @@
 %prep
 %setup -q -n kdeedu-%{version}
 %patch0 -p1 -b .openbabel
+%patch1 -p1 -b .cfitsio
 
 
 %build
@@ -163,6 +166,9 @@
 
 
 %changelog
+* Fri Mar 07 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.2-3
+- fix cfitsio detection by using pkgconfig
+
 * Fri Mar 07 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.2-2
 - reenable BR openbabel-devel, fix build with it
 - add BR gpsd-devel (for marble), libnova-devel (for KStars)