[mingw32-OpenSceneGraph/f14/master] Fix patch to apply Remove unused files

[stefanriemens]

commit 34377a89d1541b8e8b988ad47ce26346c3c578f7
Author: Stefan <s.riemens at student.fontys.nl>
Date:   Fri Sep 10 16:57:19 2010 +0200

    Fix patch to apply
    Remove unused files

 OpenSceneGraph-2.8.2.diff                    |   33 --------------------------
 mingw32-OSG-disable-problematic-plugins.diff |   22 +++++++++--------
 mingw32-OSG-jpeg-boolean-fix.diff            |   29 ----------------------
 mingw32-OpenSceneGraph.spec                  |    9 ++++--
 4 files changed, 18 insertions(+), 75 deletions(-)
---
diff --git a/mingw32-OSG-disable-problematic-plugins.diff b/mingw32-OSG-disable-problematic-plugins.diff
index 2820184..31563f1 100644
--- a/mingw32-OSG-disable-problematic-plugins.diff
+++ b/mingw32-OSG-disable-problematic-plugins.diff
@@ -1,22 +1,24 @@
---- 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 @@
+diff --git a/src/osgPlugins/CMakeLists.txt b/src/osgPlugins/CMakeLists.txt
+index 202ca68..04473bc 100644
+--- a/src/osgPlugins/CMakeLists.txt
++++ b/src/osgPlugins/CMakeLists.txt
+@@ -88,7 +88,7 @@ IF(JPEG_FOUND)
      ADD_SUBDIRECTORY(jpeg)
  ENDIF(JPEG_FOUND)
  IF(JASPER_FOUND)
--#    ADD_SUBDIRECTORY(jp2)
-+    ADD_SUBDIRECTORY(jp2)
+-    ADD_SUBDIRECTORY(jp2)
++#    ADD_SUBDIRECTORY(jp2)
  ENDIF(JASPER_FOUND)
  IF(OPENEXR_FOUND)
      ADD_SUBDIRECTORY(exr)
-@@ -196,8 +196,8 @@
+@@ -196,8 +196,8 @@ ADD_SUBDIRECTORY(bsp)
  ADD_SUBDIRECTORY(mdl)
  
  IF(OSG_CPP_EXCEPTIONS_AVAILABLE)
--#    ADD_SUBDIRECTORY(ply)
--#    ADD_SUBDIRECTORY(txp)
-+    ADD_SUBDIRECTORY(ply)
-+    ADD_SUBDIRECTORY(txp)
+-    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 f1a7a60..0c77e12 100644
--- a/mingw32-OpenSceneGraph.spec
+++ b/mingw32-OpenSceneGraph.spec
@@ -9,7 +9,7 @@
 
 Name:           mingw32-OpenSceneGraph
 Version:        %{apivers}
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Fedora mingw high performance real-time graphics toolkit
 
 Group:          Development/Libraries
@@ -63,10 +63,10 @@ for rapid development of graphics applications.
 
 %prep
 %setup -q -c
-cd %{OSGSRCDIR}
+pushd %{OSGSRCDIR}
 %patch0 -p1
 %patch100 -p1
-cd ..
+popd
 
 %build
 mkdir -p BUILD
@@ -226,6 +226,9 @@ compile-time in a shared object library.
 %{_mingw32_includedir}/OpenThreads
 
 %changelog
+* Fri Sep 10 2010 Stefan Riemens <fgfs.stefan at gmail.com> - 2.8.3-2
+- Fix patch: it was created with the original and patched files in reverse order (shame on me...)
+
 * Thu Sep 2 2010 Stefan Riemens <fgfs.stefan at gmail.com> - 2.8.3-1
 - Rebase mingw32-OSG-disable-problematic-plugins.patch