rpms/kdeedu/F-9 kdeedu-4.0.4-cfitsio.patch, NONE, 1.1 kdeedu.spec, 1.100, 1.101

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/kdeedu/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1380

Modified Files:
	kdeedu.spec 
Added Files:
	kdeedu-4.0.4-cfitsio.patch 
Log Message:
* Wed May 07 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.4-2
- still need cfitsio patch


kdeedu-4.0.4-cfitsio.patch:

--- NEW FILE kdeedu-4.0.4-cfitsio.patch ---
diff -up kdeedu-4.0.4/cmake/modules/FindCFitsio.cmake.cfitsio kdeedu-4.0.4/cmake/modules/FindCFitsio.cmake
--- kdeedu-4.0.4/cmake/modules/FindCFitsio.cmake.cfitsio	2008-01-04 17:56:03.000000000 -0600
+++ kdeedu-4.0.4/cmake/modules/FindCFitsio.cmake	2008-05-07 14:36:53.000000000 -0500
@@ -20,13 +20,22 @@ 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
+    ${_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/F-9/kdeedu.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- kdeedu.spec	7 May 2008 14:27:36 -0000	1.100
+++ kdeedu.spec	7 May 2008 19:39:58 -0000	1.101
@@ -14,7 +14,7 @@
 Name:    kdeedu
 Summary: Educational/Edutainment applications 
 Version: 4.0.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 Group:	 Amusements/Games
@@ -22,6 +22,8 @@
 Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdeedu-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch1:  kdeedu-4.0.4-cfitsio.patch
+
 # http://bugzilla.redhat.com/371121
 Obsoletes: kalgebra < 1:0.7-7
 Provides:  kalgebra = 1:0.7-7
@@ -107,6 +109,8 @@
 %prep
 %setup -q -n kdeedu-%{version}
 
+%patch1 -p1 -b .cfitsio
+
 
 %build
 
@@ -116,7 +120,8 @@
 popd
 
 # smp build busted?
-make -C %{_target_platform} VERBOSE=1
+make -k %{?_smp_mflags} -C %{_target_platform} VERBOSE=1 || \
+  make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
 
 
 %install
@@ -173,6 +178,9 @@
 
 
 %changelog
+* Wed May 07 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.4-2
+- still need cfitsio patch
+
 * Tue May 06 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.4-1
 - kde-4.0.4