rpms/kdeedu/devel kdeedu-4.1.72-cfitsio.patch, NONE, 1.1 kdeedu.spec, 1.133, 1.134

[Than Ngo]

Author: than

Update of /cvs/extras/rpms/kdeedu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1114

Modified Files:
	kdeedu.spec 
Added Files:
	kdeedu-4.1.72-cfitsio.patch 
Log Message:
fix changelog


kdeedu-4.1.72-cfitsio.patch:

--- NEW FILE kdeedu-4.1.72-cfitsio.patch ---
diff -Naur kdeedu-4.1.72/cmake/modules/FindCFitsio.cmake kdeedu-4.1.72.cfitsio/cmake/modules/FindCFitsio.cmake
--- kdeedu-4.1.72/cmake/modules/FindCFitsio.cmake	2008-10-30 15:14:46.000000000 +0100
+++ kdeedu-4.1.72.cfitsio/cmake/modules/FindCFitsio.cmake	2008-11-14 12:29:06.000000000 +0100
@@ -20,14 +20,24 @@
 
 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
     PATH_SUFFIXES libcfitsio0
+    ${_CFitsioIncDir}
     ${_obIncDir}
     ${GNUWIN32_DIR}/include
   )
 
   find_library(CFITSIO_LIBRARIES NAMES cfitsio
     PATHS
+    ${_CFitsioLinkDir}
     ${_obLinkDir}
     ${GNUWIN32_DIR}/lib
   )


Index: kdeedu.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeedu/devel/kdeedu.spec,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- kdeedu.spec	20 Nov 2008 14:11:40 -0000	1.133
+++ kdeedu.spec	20 Nov 2008 14:16:16 -0000	1.134
@@ -394,7 +394,7 @@
 * Thu Nov 20 2008 Than Ngo <than at redhat.com> 4.1.80-2
 - merged
 
-* Fri Nov 21 2008 Lorenzo Villani <lvillani at binaryhelix.net> - 4.1.80-1
+* Thu Nov 20 2008 Lorenzo Villani <lvillani at binaryhelix.net> - 4.1.80-1
 - 4.1.80
 - BR cmake 2.6.2
 - BR python-devel