rpms/OpenSceneGraph/devel OpenSceneGraph-2.8.3.diff, NONE, 1.1 .cvsignore, 1.16, 1.17 OpenSceneGraph.spec, 1.48, 1.49 sources, 1.16, 1.17 OpenSceneGraph-2.8.2.diff, 1.2, NONE

corsepiu corsepiu at fedoraproject.org
Fri Jul 2 06:44:53 UTC 2010 

Author: corsepiu

Update of /cvs/pkgs/rpms/OpenSceneGraph/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv31817

Modified Files:
	.cvsignore OpenSceneGraph.spec sources 
Added Files:
	OpenSceneGraph-2.8.3.diff 
Removed Files:
	OpenSceneGraph-2.8.2.diff 
Log Message:
* Fri Jul 02 2010 Ralf Corsépius <corsepiu at fedoraproject.org> - 2.8.3-1
- Upstream update.
- Add osg-examples-gtk.


OpenSceneGraph-2.8.3.diff:
 CMakeLists.txt                       |    4 ++--
 CMakeModules/OsgMacroUtils.cmake     |    2 +-
 examples/osgviewerSDL/CMakeLists.txt |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE OpenSceneGraph-2.8.3.diff ---
diff -Naur OpenSceneGraph-2.8.3.orig/CMakeLists.txt OpenSceneGraph-2.8.3/CMakeLists.txt
--- OpenSceneGraph-2.8.3.orig/CMakeLists.txt	2010-04-01 11:02:54.000000000 +0200
+++ OpenSceneGraph-2.8.3/CMakeLists.txt	2010-07-02 06:01:43.000000000 +0200
@@ -722,7 +722,7 @@
         ${PROJECT_BINARY_DIR}/doc/OpenSceneGraphReferenceDocs/osg32-32.png COPYONLY
     )
     #INSTALL(FILES ${PROJECT_BINARY_DIR}/doc/${PROJECT_NAME}ReferenceDocs-${OPENSCENEGRAPH_VERSION}.chm DESTINATION doc OPTIONAL COMPONENT openscenegraph-doc)
-    INSTALL(DIRECTORY ${PROJECT_BINARY_DIR}/doc/OpenSceneGraphReferenceDocs DESTINATION doc COMPONENT openscenegraph-doc)
+    #INSTALL(DIRECTORY ${PROJECT_BINARY_DIR}/doc/OpenSceneGraphReferenceDocs DESTINATION doc COMPONENT openscenegraph-doc)
 
     # now set up openthreads documentation generation
     IF(BUILD_REF_DOCS_TAGFILE)
@@ -738,7 +738,7 @@
         ${PROJECT_BINARY_DIR}/doc/OpenThreadsReferenceDocs/osg32-32.png COPYONLY
     )
     #INSTALL(FILES ${PROJECT_BINARY_DIR}/doc/${PROJECT_NAME}ReferenceDocs-${OPENSCENEGRAPH_VERSION}.chm DESTINATION doc OPTIONAL COMPONENT openscenegraph-doc)
-    INSTALL(DIRECTORY ${PROJECT_BINARY_DIR}/doc/OpenThreadsReferenceDocs DESTINATION doc COMPONENT openthreads-doc)
+    #INSTALL(DIRECTORY ${PROJECT_BINARY_DIR}/doc/OpenThreadsReferenceDocs DESTINATION doc COMPONENT openthreads-doc)
 
     # Process our other doxyfiles but don't create targets for these
     CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/doc/Doxyfiles/all_Doxyfile
diff -Naur OpenSceneGraph-2.8.3.orig/CMakeModules/OsgMacroUtils.cmake OpenSceneGraph-2.8.3/CMakeModules/OsgMacroUtils.cmake
--- OpenSceneGraph-2.8.3.orig/CMakeModules/OsgMacroUtils.cmake	2010-03-13 11:40:02.000000000 +0100
+++ OpenSceneGraph-2.8.3/CMakeModules/OsgMacroUtils.cmake	2010-04-07 13:57:05.000000000 +0200
@@ -307,7 +307,7 @@
         IF(APPLE)
             INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION share/OpenSceneGraph/bin BUNDLE DESTINATION share/OpenSceneGraph/bin )            
         ELSE(APPLE)
-            INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION share/OpenSceneGraph/bin COMPONENT openscenegraph-examples )
+            INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION bin COMPONENT openscenegraph-examples )
         ENDIF(APPLE)
 
 ENDMACRO(SETUP_EXAMPLE)
diff -Naur OpenSceneGraph-2.8.3.orig/examples/osgviewerSDL/CMakeLists.txt OpenSceneGraph-2.8.3/examples/osgviewerSDL/CMakeLists.txt
--- OpenSceneGraph-2.8.3.orig/examples/osgviewerSDL/CMakeLists.txt	2010-03-30 09:07:48.000000000 +0200
+++ OpenSceneGraph-2.8.3/examples/osgviewerSDL/CMakeLists.txt	2010-07-02 05:00:45.000000000 +0200
@@ -13,7 +13,7 @@
                # Depending on platform (or SDL version),
                # this may or may not link successfully.
                SET(TARGET_SRC osgviewerSDL.cpp)
-               SET(TARGET_EXTERNAL_LIBRARIES ${SDLMAIN_LIBRARY} ${TARGET_EXTERNAL_LIBRARIES} )
+               SET(TARGET_EXTERNAL_LIBRARIES ${SDL_LIBRARY} ${TARGET_EXTERNAL_LIBRARIES} )
        ENDIF()
 ENDIF()
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/OpenSceneGraph/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	18 Aug 2009 03:02:58 -0000	1.16
+++ .cvsignore	2 Jul 2010 06:44:53 -0000	1.17
@@ -1 +1 @@
-OpenSceneGraph-2.8.2.zip
+OpenSceneGraph-2.8.3.zip


Index: OpenSceneGraph.spec
===================================================================
RCS file: /cvs/pkgs/rpms/OpenSceneGraph/devel/OpenSceneGraph.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- OpenSceneGraph.spec	26 Aug 2009 10:16:43 -0000	1.48
+++ OpenSceneGraph.spec	2 Jul 2010 06:44:53 -0000	1.49
@@ -1,15 +1,15 @@
 #
-# Copyright (c) 2005, 2006, 2007, 2008, 2009 Ralf Corsepius, Ulm, Germany.
+# Copyright (c) 2005, 2006, 2007, 2008, 2009, 2010 Ralf Corsepius, Ulm, Germany.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
 
-%define apivers 2.8.2
-%define srcvers 2.8.2
+%define apivers 2.8.3
+%define srcvers 2.8.3
 
 Name:           OpenSceneGraph
 Version:        %{apivers}
-Release:        3%{?dist}
+Release:        1%{?dist}
 Summary:        High performance real-time graphics toolkit
 
 Group:          Applications/Multimedia
@@ -36,6 +36,11 @@ BuildRequires:  doxygen graphviz
 BuildRequires:  cmake
 BuildRequires:  wxGTK-devel
 BuildRequires:  curl-devel
+BuildRequires:  libxml2-devel
+BuildRequires:  gtkglext-devel
+BuildRequires:  librsvg2-devel
+BuildRequires:  poppler-glib-devel
+BuildRequires:  openal-soft-devel
 
 BuildRequires:	qt-devel
 
@@ -43,6 +48,8 @@ BuildRequires:  SDL-devel
 
 BuildRequires:  fltk-devel
 
+BuildRequires:  gnuplot
+
 # OSG packaging madness ;)
 %define OSGSRCDIR       OpenSceneGraph-%{version}
 
@@ -165,6 +172,20 @@ OSG sample applications using FLTK
 %defattr(-,root,root,-)
 %{_bindir}/osgviewerFLTK
 
+%package examples-gtk
+Summary:        OSG sample applications using gtk
+Group:          Applications/Multimedia
+%if "%{name}" == "OpenSceneGraph"
+Provides:       OpenSceneGraph2-examples-gtk = %{version}-%{release}
+%endif
+
+%description examples-gtk
+OSG sample applications using gtk
+
+%files examples-gtk
+%defattr(-,root,root,-)
+%{_bindir}/osgviewerGTK
+
 %package examples-qt
 Summary:        OSG sample applications using qt
 Group:          Applications/Multimedia
@@ -193,6 +214,7 @@ Sample applications for OpenSceneGraph
 %files examples
 %defattr(-,root,root,-)
 %{_bindir}/osg2cpp
+%{_bindir}/osganimationhardware
 %{_bindir}/osganimationmakepath
 %{_bindir}/osganimationnode
 %{_bindir}/osganimationskinning
@@ -360,6 +382,10 @@ Development files for OpenThreads.
 %{_includedir}/OpenThreads
 
 %changelog
+* Fri Jul 02 2010 Ralf Corsépius <corsepiu at fedoraproject.org> - 2.8.3-1
+- Upstream update.
+- Add osg-examples-gtk.
+
 * Wed Aug 26 2009 Ralf Corsépius <corsepiu at fedoraproject.org> - 2.8.2-3
 - Change Source0 URL (Upstream moved it once again).
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/OpenSceneGraph/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	18 Aug 2009 03:02:59 -0000	1.16
+++ sources	2 Jul 2010 06:44:53 -0000	1.17
@@ -1 +1 @@
-99d0b37f403b85b4559514b6b9849d9e  OpenSceneGraph-2.8.2.zip
+dc43b9161555c4eab7f5a678dd4e01ab  OpenSceneGraph-2.8.3.zip


--- OpenSceneGraph-2.8.2.diff DELETED ---

More information about the scm-commits mailing list