rpms/kdeedu/devel kdeedu-4.1.85-cfitsio.patch, NONE, 1.1 kdeedu.spec, 1.145, 1.146 kdeedu-4.1.72-cfitsio.patch, 1.1, NONE

[Rex Dieter]

Author: rdieter

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

Modified Files:
	kdeedu.spec 
Added Files:
	kdeedu-4.1.85-cfitsio.patch 
Removed Files:
	kdeedu-4.1.72-cfitsio.patch 
Log Message:
rebase cfitsio patch


kdeedu-4.1.85-cfitsio.patch:

--- NEW FILE kdeedu-4.1.85-cfitsio.patch ---
diff -up kdeedu-4.1.85/cmake/modules/FindCFitsio.cmake.cfitsio kdeedu-4.1.85/cmake/modules/FindCFitsio.cmake
--- kdeedu-4.1.85/cmake/modules/FindCFitsio.cmake.cfitsio	2008-11-28 09:33:47.000000000 -0600
+++ kdeedu-4.1.85/cmake/modules/FindCFitsio.cmake	2008-12-12 19:36:43.000000000 -0600
@@ -20,14 +20,23 @@ if (CFITSIO_INCLUDE_DIR AND CFITSIO_LIBR
 
 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 libcfitsio
     PATHS
+    ${_CFitsioLinkDir}
     ${_obLinkDir}
     ${GNUWIN32_DIR}/lib
   )


Index: kdeedu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/devel/kdeedu.spec,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -r1.145 -r1.146
--- kdeedu.spec	12 Dec 2008 10:41:00 -0000	1.145
+++ kdeedu.spec	13 Dec 2008 01:38:13 -0000	1.146
@@ -23,7 +23,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # fix cfitsio detection by using pkgconfig
-Patch0:  kdeedu-4.1.72-cfitsio.patch
+Patch0:  kdeedu-4.1.85-cfitsio.patch
 
 # http://bugzilla.redhat.com/371121
 Obsoletes: kalgebra < 1:0.7-7


--- kdeedu-4.1.72-cfitsio.patch DELETED ---