rpms/kdeedu/devel kdeedu-4.2.0-indi_nodrivers.patch, NONE, 1.1 kdeedu.spec, 1.162, 1.163

[Rex Dieter]

Author: rdieter

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

Modified Files:
	kdeedu.spec 
Added Files:
	kdeedu-4.2.0-indi_nodrivers.patch 
Log Message:
* Mon Feb 07 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.0-7
- kstars does not supply INDI (#478539)


kdeedu-4.2.0-indi_nodrivers.patch:

--- NEW FILE kdeedu-4.2.0-indi_nodrivers.patch ---
diff -up kdeedu-4.2.0/cmake/modules/FindINDI.cmake.nodrivers kdeedu-4.2.0/cmake/modules/FindINDI.cmake
--- kdeedu-4.2.0/cmake/modules/FindINDI.cmake.nodrivers	2008-10-30 09:14:46.000000000 -0500
+++ kdeedu-4.2.0/cmake/modules/FindINDI.cmake	2009-02-09 13:57:44.000000000 -0600
@@ -11,14 +11,14 @@
 # Redistribution and use is allowed according to the terms of the BSD license.
 # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
 
-if (INDI_INCLUDE_DIR AND INDI_LIBRARIES AND INDI_DRIVER_LIBRARIES)
+if (INDI_INCLUDE_DIR AND INDI_LIBRARIES)
 
   # in cache already
   set(INDI_FOUND TRUE)
   message(STATUS "Found INDI: ${INDI_LIBRARIES}")
 
 
-else (INDI_INCLUDE_DIR AND INDI_LIBRARIES AND INDI_DRIVER_LIBRARIES)
+else (INDI_INCLUDE_DIR AND INDI_LIBRARIES)
 
   find_path(INDI_INCLUDE_DIR indidevapi.h
     PATH_SUFFIXES libindi
@@ -26,28 +26,22 @@ else (INDI_INCLUDE_DIR AND INDI_LIBRARIE
     ${GNUWIN32_DIR}/include
   )
 
-  find_library(INDI_DRIVER_LIBRARIES NAMES indidriver
-    PATHS
-    ${_obLinkDir}
-    ${GNUWIN32_DIR}/lib
-  )
-
   find_library(INDI_LIBRARIES NAMES indi
     PATHS
     ${_obLinkDir}
     ${GNUWIN32_DIR}/lib
   )
 
-  if(INDI_INCLUDE_DIR AND INDI_LIBRARIES AND INDI_DRIVER_LIBRARIES)
+  if(INDI_INCLUDE_DIR AND INDI_LIBRARIES)
     set(INDI_FOUND TRUE)
-  else (INDI_INCLUDE_DIR AND INDI_LIBRARIES AND INDI_DRIVER_LIBRARIES)
+  else (INDI_INCLUDE_DIR AND INDI_LIBRARIES)
     set(INDI_FOUND FALSE)
-  endif(INDI_INCLUDE_DIR AND INDI_LIBRARIES AND INDI_DRIVER_LIBRARIES)
+  endif(INDI_INCLUDE_DIR AND INDI_LIBRARIES)
 
 
   if (INDI_FOUND)
     if (NOT INDI_FIND_QUIETLY)
-      message(STATUS "Found INDI: ${INDI_LIBRARIES}, ${INDI_DRIVER_LIBRARIES}")
+      message(STATUS "Found INDI: ${INDI_LIBRARIES}")
     endif (NOT INDI_FIND_QUIETLY)
   else (INDI_FOUND)
     if (INDI_FIND_REQUIRED)
@@ -55,6 +49,6 @@ else (INDI_INCLUDE_DIR AND INDI_LIBRARIE
     endif (INDI_FIND_REQUIRED)
   endif (INDI_FOUND)
 
-  mark_as_advanced(INDI_INCLUDE_DIR INDI_LIBRARIES INDI_DRIVER_LIBRARIES)
+  mark_as_advanced(INDI_INCLUDE_DIR INDI_LIBRARIES)
 
-endif (INDI_INCLUDE_DIR AND INDI_LIBRARIES AND INDI_DRIVER_LIBRARIES)
+endif (INDI_INCLUDE_DIR AND INDI_LIBRARIES)


Index: kdeedu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/devel/kdeedu.spec,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -r1.162 -r1.163
--- kdeedu.spec	6 Feb 2009 14:38:26 -0000	1.162
+++ kdeedu.spec	9 Feb 2009 20:13:59 -0000	1.163
@@ -14,7 +14,7 @@
 Name:    kdeedu
 Summary: Educational/Edutainment applications
 Version: 4.2.0
-Release: 6%{?dist}
+Release: 7%{?dist}
 
 License: GPLv2
 Group:	 Amusements/Games
@@ -22,6 +22,8 @@
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdeedu-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch1: kdeedu-4.2.0-indi_nodrivers.patch
+
 # http://bugzilla.redhat.com/371121
 Obsoletes: kalgebra < 1:0.7-7
 Provides:  kalgebra = 1:0.7-7
@@ -38,8 +40,9 @@
 BuildRequires: gmm-devel
 BuildRequires: gpsd-devel
 BuildRequires: gsl-devel
+BuildRequires: kdelibs4-devel >= %{version}
 BuildRequires: plasma-devel >= %{version}
-# for macros.kde4
+BuildRequires: libindi-devel
 BuildRequires: libnova-devel
 BuildRequires: libqalculate-devel
 BuildRequires: libusb-devel
@@ -58,8 +61,6 @@
 #-- The following OPTIONAL packages could NOT be located on your system.
 #+ Experimental Python binding support for the Marble library: Experimental Python binding support for the Marble library <http://techbase.kde.org/Development/Languages/Python>
 #Experimental Python binding support for the Marble library. To activate it pass -DEXPERIMENTAL_PYTHON_BINDINGS=TRUE to cmake.
-#+ libindi, 0.6 or higher: A framework for controlling astronomical devices such as telescopes, CCDs, filter wheels..etc. <http://indi.sf.net>
-#Gives KStars support for controlling astronomical devices.
 
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
 Requires: %{name}-libs = %{version}-%{release}
@@ -151,6 +152,8 @@
 %prep
 %setup -q -n kdeedu-%{version}
 
+%patch1 -p1 -b .indi_nodrivers
+
 
 %build
 mkdir -p %{_target_platform}
@@ -428,6 +431,9 @@
 
 
 %changelog
+* Mon Feb 07 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.0-7
+- kstars does not supply INDI (#478539)
+
 * Fri Feb 06 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.0-6
 - use system sj-stevehand-fonts (#477406)