[mingw32-OpenSceneGraph/f14/master] Rebase patch

[stefanriemens]

commit 6009a50f2ba699ca65c07a642fd03ea66f751bb0
Author: Stefan <s.riemens at student.fontys.nl>
Date:   Thu Sep 2 15:57:38 2010 +0200

    Rebase patch

 mingw32-OSG-disable-problematic-plugins.diff |   52 +++++++++++---------------
 mingw32-OpenSceneGraph.spec                  |    5 ++-
 2 files changed, 26 insertions(+), 31 deletions(-)
---
diff --git a/mingw32-OSG-disable-problematic-plugins.diff b/mingw32-OSG-disable-problematic-plugins.diff
index a43e564..2820184 100644
--- a/mingw32-OSG-disable-problematic-plugins.diff
+++ b/mingw32-OSG-disable-problematic-plugins.diff
@@ -1,30 +1,22 @@
---- OpenSceneGraph-2.8.3/src/osgPlugins/CMakeLists.txt.orig	2010-04-01 11:13:18.000000000 +0200
-+++ OpenSceneGraph-2.8.3/src/osgPlugins/CMakeLists.txt	2010-07-17 16:58:37.195801767 +0200
-@@ -87,9 +87,9 @@
- IF(JPEG_FOUND)
-     ADD_SUBDIRECTORY(jpeg)
- ENDIF(JPEG_FOUND)
--IF(JASPER_FOUND)
--    ADD_SUBDIRECTORY(jp2)
--ENDIF(JASPER_FOUND)
-+#IF(JASPER_FOUND)
-+#    ADD_SUBDIRECTORY(jp2)
-+#ENDIF(JASPER_FOUND)
- IF(OPENEXR_FOUND)
-     ADD_SUBDIRECTORY(exr)
- ENDIF(OPENEXR_FOUND)
-@@ -195,10 +195,10 @@
- ADD_SUBDIRECTORY(bsp)
- ADD_SUBDIRECTORY(mdl)
- 
--IF(OSG_CPP_EXCEPTIONS_AVAILABLE)
--    ADD_SUBDIRECTORY(ply)
--    ADD_SUBDIRECTORY(txp)
--ENDIF()
-+#IF(OSG_CPP_EXCEPTIONS_AVAILABLE)
-+#    ADD_SUBDIRECTORY(ply)
-+#    ADD_SUBDIRECTORY(txp)
-+#ENDIF()
- 
- IF(XINE_FOUND)
-     ADD_SUBDIRECTORY(xine)
+--- OpenSceneGraph-2.8.3/src/osgPlugins/CMakeLists.txt	2010-09-02 15:50:13.655664588 +0200
++++ OpenSceneGraph-2.8.3/src/osgPlugins/CMakeLists.txt.orig	2010-09-02 15:49:45.479916725 +0200
+@@ -88,7 +88,7 @@
+     ADD_SUBDIRECTORY(jpeg)
+ ENDIF(JPEG_FOUND)
+ IF(JASPER_FOUND)
+-#    ADD_SUBDIRECTORY(jp2)
++    ADD_SUBDIRECTORY(jp2)
+ ENDIF(JASPER_FOUND)
+ IF(OPENEXR_FOUND)
+     ADD_SUBDIRECTORY(exr)
+@@ -196,8 +196,8 @@
+ ADD_SUBDIRECTORY(mdl)
+ 
+ IF(OSG_CPP_EXCEPTIONS_AVAILABLE)
+-#    ADD_SUBDIRECTORY(ply)
+-#    ADD_SUBDIRECTORY(txp)
++    ADD_SUBDIRECTORY(ply)
++    ADD_SUBDIRECTORY(txp)
+ ENDIF()
+ 
+ IF(XINE_FOUND)
diff --git a/mingw32-OpenSceneGraph.spec b/mingw32-OpenSceneGraph.spec
index 640bef4..f1a7a60 100644
--- a/mingw32-OpenSceneGraph.spec
+++ b/mingw32-OpenSceneGraph.spec
@@ -9,7 +9,7 @@
 
 Name:           mingw32-OpenSceneGraph
 Version:        %{apivers}
-Release:        0.1%{?dist}
+Release:        1%{?dist}
 Summary:        Fedora mingw high performance real-time graphics toolkit
 
 Group:          Development/Libraries
@@ -226,6 +226,9 @@ compile-time in a shared object library.
 %{_mingw32_includedir}/OpenThreads
 
 %changelog
+* Thu Sep 2 2010 Stefan Riemens <fgfs.stefan at gmail.com> - 2.8.3-1
+- Rebase mingw32-OSG-disable-problematic-plugins.patch
+
 * Sat Aug  7 2010 Richard W.M. Jones <rjones at redhat.com> - 2.8.3-0.1
 - Bump and rebuild to try to fix libpng dependency problem.