rpms/kdeedu/F-10 kdeedu-4.1.3-cfitsio.patch,NONE,1.1

Rex Dieter rdieter at fedoraproject.org
Thu Dec 18 17:33:21 UTC 2008


Author: rdieter

Update of /cvs/pkgs/rpms/kdeedu/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23362

Added Files:
	kdeedu-4.1.3-cfitsio.patch 
Log Message:
import new patch


kdeedu-4.1.3-cfitsio.patch:

--- NEW FILE kdeedu-4.1.3-cfitsio.patch ---
diff -up kdeedu-4.1.3/cmake/modules/FindCFitsio.cmake.cfitsio kdeedu-4.1.3/cmake/modules/FindCFitsio.cmake
--- kdeedu-4.1.3/cmake/modules/FindCFitsio.cmake.cfitsio	2008-01-04 17:56:03.000000000 -0600
+++ kdeedu-4.1.3/cmake/modules/FindCFitsio.cmake	2008-12-18 11:13:57.000000000 -0600
@@ -20,13 +20,20 @@ if (CFITSIO_INCLUDE_DIR AND CFITSIO_LIBR
 
 else (CFITSIO_INCLUDE_DIR AND CFITSIO_LIBRARIES)
 
+  IF (NOT WIN32)
+    find_package(PkgConfig)
+    pkg_check_modules(CFITSIO cfitsio)
+  ENDIF (NOT WIN32)
+
   find_path(CFITSIO_INCLUDE_DIR fitsio.h
+    ${CFITSIO_INCLUDE_DIRS}
     ${_obIncDir}
     ${GNUWIN32_DIR}/include
   )
 
   find_library(CFITSIO_LIBRARIES NAMES cfitsio
     PATHS
+    ${CFITSIO_LIBRARY_DIRS}
     ${_obLinkDir}
     ${GNUWIN32_DIR}/lib
   )




More information about the fedora-extras-commits mailing list