[kdeedu/f13/master] - resurrect indi_nodrivers patch (#640522)

[Rex Dieter]

commit 35f817b24cae95e89e32a5328ad4695bb35c9832
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Oct 11 09:24:34 2010 -0500

    - resurrect indi_nodrivers patch (#640522)

 kdeedu-4.2.0-indi_nodrivers.patch |   62 +++++++++++++++++++++++++++++++++++++
 kdeedu.spec                       |   11 ++++++-
 2 files changed, 72 insertions(+), 1 deletions(-)
---
diff --git a/kdeedu-4.2.0-indi_nodrivers.patch b/kdeedu-4.2.0-indi_nodrivers.patch
new file mode 100644
index 0000000..f2793ae
--- /dev/null
+++ b/kdeedu-4.2.0-indi_nodrivers.patch
@@ -0,0 +1,62 @@
+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)
diff --git a/kdeedu.spec b/kdeedu.spec
index 0a49796..8db99c8 100644
--- a/kdeedu.spec
+++ b/kdeedu.spec
@@ -8,7 +8,7 @@
 Name:    kdeedu
 Summary: Educational/Edutainment applications
 Version: 4.4.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 Group:	 Amusements/Games
@@ -16,6 +16,10 @@ URL:     http://www.kde.org/
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdeedu-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+## upstreamable patches
+# bugzilla.redhat.com/640522 
+Patch50: kdeedu-4.2.0-indi_nodrivers.patch
+
 ## upstream patches
 
 Obsoletes: kdeedu4 < %{version}-%{release}
@@ -187,6 +191,8 @@ Group:   System Environment/Libraries
 %prep
 %setup -q -n kdeedu-%{version}%{?alphatag}
 
+%patch50 -p1 -b .indi_nodrivers
+
 
 %build
 mkdir -p %{_target_platform}
@@ -570,6 +576,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Oct 11 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.4.5-2
+- resurrect indi_nodrivers patch (#640522)
+
 * Tue Jun 29 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.4.5-1
 - 4.4.5