rpms/OpenSceneGraph/devel OpenSceneGraph-2.4.0.diff, 1.1, 1.2 OpenSceneGraph.spec, 1.35, 1.36

[Ralf Corsépius (corsepiu)]

Author: corsepiu

Update of /cvs/pkgs/rpms/OpenSceneGraph/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2078

Modified Files:
	OpenSceneGraph-2.4.0.diff OpenSceneGraph.spec 
Log Message:
* Tue May 13 2008 Ralf Corsépius <rc040203 at freenet.de> - 2.4.0-2
- Add Orion Poplawski's patch to fix building with cmake-2.6.0.


OpenSceneGraph-2.4.0.diff:

Index: OpenSceneGraph-2.4.0.diff
===================================================================
RCS file: /cvs/pkgs/rpms/OpenSceneGraph/devel/OpenSceneGraph-2.4.0.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- OpenSceneGraph-2.4.0.diff	12 May 2008 04:44:47 -0000	1.1
+++ OpenSceneGraph-2.4.0.diff	13 May 2008 04:15:32 -0000	1.2
@@ -115,3 +115,26 @@
      class SoGroup      *ivHead;
      class SoTexture2   *ivTexture;
      class SoMaterial   *ivMaterial;
+diff -Naur OpenSceneGraph-2.4.0.orig/src/OpenThreads/pthreads/CMakeLists.txt OpenSceneGraph-2.4.0/src/OpenThreads/pthreads/CMakeLists.txt
+--- OpenSceneGraph-2.4.0.orig/src/OpenThreads/pthreads/CMakeLists.txt	2008-04-24 13:34:43.000000000 +0200
++++ OpenSceneGraph-2.4.0/src/OpenThreads/pthreads/CMakeLists.txt	2008-05-13 06:08:54.000000000 +0200
+@@ -26,8 +26,8 @@
+   SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES VERSION ${OPENTHREADS_VERSION} SOVERSION ${OPENTHREADS_SOVERSION})
+ ENDIF(OPENTHREADS_SONAMES)
+ 
+-SET(CMAKE_REQUIRED_LIBRARIES_SAFE "${CMAKE_REQUIRED_LIBRARIES}")
+-SET(CMAKE_REQUIRED_LIBRARIES "${CMAKE_REQUIRED_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}")
++SET(CMAKE_REQUIRED_LIBRARIES_SAFE ${CMAKE_REQUIRED_LIBRARIES})
++SET(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
+ 
+ CHECK_FUNCTION_EXISTS(pthread_yield HAVE_PTHREAD_YIELD)
+ IF(HAVE_PTHREAD_YIELD)
+@@ -89,7 +89,7 @@
+   ENDIF(HAVE_THREE_PARAM_SCHED_SETAFFINITY)
+ ENDIF(HAVE_PTHREAD_SETAFFINITY_NP)
+ 
+-SET(CMAKE_REQUIRED_LIBRARIES "${CMAKE_REQUIRED_LIBRARIES_SAFE}")
++SET(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES_SAFE})
+ 
+ TARGET_LINK_LIBRARIES(${LIB_NAME}
+ 	${CMAKE_THREAD_LIBS_INIT}


Index: OpenSceneGraph.spec
===================================================================
RCS file: /cvs/pkgs/rpms/OpenSceneGraph/devel/OpenSceneGraph.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- OpenSceneGraph.spec	12 May 2008 04:46:25 -0000	1.35
+++ OpenSceneGraph.spec	13 May 2008 04:15:32 -0000	1.36
@@ -14,7 +14,7 @@
 
 Name:           OpenSceneGraph
 Version:        2.4.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        High performance real-time graphics toolkit
 
 Group:          Applications/Multimedia
@@ -393,6 +393,9 @@
 %{_includedir}/OpenThreads
 
 %changelog
+* Tue May 13 2008 Ralf Corsépius <rc040203 at freenet.de> - 2.4.0-2
+- Add Orion Poplawski's patch to fix building with cmake-2.6.0.
+
 * Mon May 12 2008 Ralf Corsépius <rc040203 at freenet.de> - 2.4.0-1
 - Upstream update.
 - Adjust patches to 2.4.0.