rpms/kdeedu/devel kdeedu-4.0.2-cfitsio.patch, 1.1, 1.2 kdeedu.spec, 1.88, 1.89

[Kevin Kofler (kkofler)]

Author: kkofler

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

Modified Files:
	kdeedu-4.0.2-cfitsio.patch kdeedu.spec 
Log Message:
- fix cfitsio detection by adding another hardcoded directory

(cfitsio.pc is broken in the Fedora cfitsio package, #436539)

kdeedu-4.0.2-cfitsio.patch:

Index: kdeedu-4.0.2-cfitsio.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/devel/kdeedu-4.0.2-cfitsio.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdeedu-4.0.2-cfitsio.patch	7 Mar 2008 19:10:14 -0000	1.1
+++ kdeedu-4.0.2-cfitsio.patch	7 Mar 2008 19:43:57 -0000	1.2
@@ -1,26 +1,11 @@
 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 @@
- 
++++ kdeedu-4.0.2-cfitsio/cmake/modules/FindCFitsio.cmake	2008-03-07 20:42:06.000000000 +0100
+@@ -21,6 +21,7 @@
  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}
++    /usr/include/cfitsio
      ${_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.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- kdeedu.spec	7 Mar 2008 19:10:14 -0000	1.88
+++ kdeedu.spec	7 Mar 2008 19:43:57 -0000	1.89
@@ -9,7 +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
+# fix cfitsio detection by adding another hardcoded directory
+# (cfitsio.pc is broken in the Fedora cfitsio package, #436539)
 Patch1:  kdeedu-4.0.2-cfitsio.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -167,7 +168,7 @@
 
 %changelog
 * Fri Mar 07 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.2-3
-- fix cfitsio detection by using pkgconfig
+- fix cfitsio detection by adding another hardcoded directory
 
 * Fri Mar 07 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.2-2
 - reenable BR openbabel-devel, fix build with it