rpms/kdeedu/devel kdeedu-4.1.85-cfitsio.patch, 1.2, 1.3 kdeedu.spec, 1.149, 1.150

[Rex Dieter]

Author: rdieter

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

Modified Files:
	kdeedu-4.1.85-cfitsio.patch kdeedu.spec 
Log Message:
* Thu Dec 18 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.85-4
- respin (upstreamable) cfitsio patch


kdeedu-4.1.85-cfitsio.patch:

Index: kdeedu-4.1.85-cfitsio.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/devel/kdeedu-4.1.85-cfitsio.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kdeedu-4.1.85-cfitsio.patch	18 Dec 2008 12:34:10 -0000	1.2
+++ kdeedu-4.1.85-cfitsio.patch	18 Dec 2008 17:40:53 -0000	1.3
@@ -1,27 +1,25 @@
 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,22 @@ if (CFITSIO_INCLUDE_DIR AND CFITSIO_LIBR
++++ kdeedu-4.1.85/cmake/modules/FindCFitsio.cmake	2008-12-18 11:39:16.000000000 -0600
+@@ -20,14 +20,21 @@ 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)
++    find_package(PkgConfig)
++    pkg_check_modules(CFITSIO cfitsio)
 +  ENDIF (NOT WIN32)
 +
    find_path(CFITSIO_INCLUDE_DIR fitsio.h
--    PATH_SUFFIXES libcfitsio0
-+    ${_CFitsioIncDir}
+     PATH_SUFFIXES libcfitsio0
++    ${CFITSIO_INCLUDE_DIRS}
      ${_obIncDir}
      ${GNUWIN32_DIR}/include
    )
  
    find_library(CFITSIO_LIBRARIES NAMES cfitsio libcfitsio
      PATHS
-+    ${_CFitsioLinkDir}
++    ${CFITSIO_LIBRARY_DIRS}
      ${_obLinkDir}
      ${GNUWIN32_DIR}/lib
    )


Index: kdeedu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/devel/kdeedu.spec,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -r1.149 -r1.150
--- kdeedu.spec	18 Dec 2008 12:34:10 -0000	1.149
+++ kdeedu.spec	18 Dec 2008 17:40:53 -0000	1.150
@@ -14,7 +14,7 @@
 Name:    kdeedu
 Summary: Educational/Edutainment applications
 Version: 4.1.85
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 License: GPLv2
 Group:	 Amusements/Games
@@ -389,6 +389,9 @@
 
 
 %changelog
+* Thu Dec 18 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.85-4
+- respin (upstreamable) cfitsio patch
+
 * Thu Dec 18 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.85-3
 - fix cfitsio detection yet again