[OpenSceneGraph] Upstream update. Remove OpenSceneGraph2* tags. Split out OpenSceneGraph-qt, OpenSceneGraph-qt-devel.

corsepiu corsepiu at fedoraproject.org
Wed Aug 17 10:58:04 UTC 2011


commit 29db1dc5d3d789b867aecff0099f324822ecbe5b
Author: Ralf Corsépius <corsepiu at fedoraproject.org>
Date:   Wed Aug 17 12:57:39 2011 +0200

    Upstream update.
    Remove OpenSceneGraph2* tags.
    Split out OpenSceneGraph-qt, OpenSceneGraph-qt-devel.
    Pass -Wno-dev to cmake.
    Append -pthread to CFLAGS.

 .gitignore                |    1 +
 OpenSceneGraph-2.8.5.diff |   67 ------------
 OpenSceneGraph-3.0.1.diff |  141 +++++++++++++++++++++++++
 OpenSceneGraph.spec       |  252 +++++++++++++++++++++++++++++++--------------
 sources                   |    2 +-
 5 files changed, 317 insertions(+), 146 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index af69662..4bc54d6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /OpenSceneGraph-2.8.5.zip
+/OpenSceneGraph-3.0.1.zip
diff --git a/OpenSceneGraph-3.0.1.diff b/OpenSceneGraph-3.0.1.diff
new file mode 100644
index 0000000..a9efb9e
--- /dev/null
+++ b/OpenSceneGraph-3.0.1.diff
@@ -0,0 +1,141 @@
+diff -Naur OpenSceneGraph-3.0.1.orig/AUTHORS.txt OpenSceneGraph-3.0.1/AUTHORS.txt
+--- OpenSceneGraph-3.0.1.orig/AUTHORS.txt	2011-07-28 18:59:15.000000000 +0200
++++ OpenSceneGraph-3.0.1/AUTHORS.txt	2011-08-17 11:04:25.124392253 +0200
+@@ -345,7 +345,7 @@
+ Morten Haukness
+ Mojtaba Fathi
+ Mirko Viviani
+-Mikkel Gjøl
++Mikkel Gjøl
+ Mike Garrity
+ Michael Polak
+ Michael Morrison
+diff -Naur OpenSceneGraph-3.0.1.orig/CMakeLists.txt OpenSceneGraph-3.0.1/CMakeLists.txt
+--- OpenSceneGraph-3.0.1.orig/CMakeLists.txt	2011-07-31 09:50:34.000000000 +0200
++++ OpenSceneGraph-3.0.1/CMakeLists.txt	2011-08-16 17:37:41.370746297 +0200
+@@ -884,7 +884,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)
+@@ -900,7 +900,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-3.0.1.orig/CMakeModules/FindFLTK.cmake OpenSceneGraph-3.0.1/CMakeModules/FindFLTK.cmake
+--- OpenSceneGraph-3.0.1.orig/CMakeModules/FindFLTK.cmake	2010-11-11 17:51:46.000000000 +0100
++++ OpenSceneGraph-3.0.1/CMakeModules/FindFLTK.cmake	2011-08-16 17:37:03.677133180 +0200
+@@ -9,7 +9,7 @@
+ #
+ # Created by Robert Osfield. 
+ 
+-FIND_PATH(FLTK_INCLUDE_DIR Fl/Fl.H Fl/Fl.h
++FIND_PATH(FLTK_INCLUDE_DIR FL/Fl.H FL/Fl.h
+     $ENV{FLTK_DIR}/include
+     $ENV{FLTK_DIR}
+     ~/Library/Frameworks
+diff -Naur OpenSceneGraph-3.0.1.orig/CMakeModules/OsgMacroUtils.cmake OpenSceneGraph-3.0.1/CMakeModules/OsgMacroUtils.cmake
+--- OpenSceneGraph-3.0.1.orig/CMakeModules/OsgMacroUtils.cmake	2011-04-21 19:16:27.000000000 +0200
++++ OpenSceneGraph-3.0.1/CMakeModules/OsgMacroUtils.cmake	2011-08-16 17:36:38.269719245 +0200
+@@ -447,7 +447,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-3.0.1.orig/examples/osgviewerSDL/CMakeLists.txt OpenSceneGraph-3.0.1/examples/osgviewerSDL/CMakeLists.txt
+--- OpenSceneGraph-3.0.1.orig/examples/osgviewerSDL/CMakeLists.txt	2010-01-18 15:27:20.000000000 +0100
++++ OpenSceneGraph-3.0.1/examples/osgviewerSDL/CMakeLists.txt	2011-08-16 17:35:11.759311259 +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()
+ 
+diff -Naur OpenSceneGraph-3.0.1.orig/include/osg/Shader OpenSceneGraph-3.0.1/include/osg/Shader
+--- OpenSceneGraph-3.0.1.orig/include/osg/Shader	2010-11-23 15:50:31.000000000 +0100
++++ OpenSceneGraph-3.0.1/include/osg/Shader	2011-08-17 06:04:22.466235406 +0200
+@@ -285,7 +285,7 @@
+         ShaderComponent();
+         ShaderComponent(const ShaderComponent& sc,const CopyOp& copyop=CopyOp::SHALLOW_COPY);
+ 
+-        META_Object(osg, ShaderComponent)
++        META_Object(osg, ShaderComponent);
+ 
+         unsigned int addShader(osg::Shader* shader);
+         void removeShader(unsigned int i);
+diff -Naur OpenSceneGraph-3.0.1.orig/include/osg/ShaderComposer OpenSceneGraph-3.0.1/include/osg/ShaderComposer
+--- OpenSceneGraph-3.0.1.orig/include/osg/ShaderComposer	2011-01-31 12:40:35.000000000 +0100
++++ OpenSceneGraph-3.0.1/include/osg/ShaderComposer	2011-08-17 06:04:16.405137459 +0200
+@@ -31,7 +31,7 @@
+ 
+         ShaderComposer();
+         ShaderComposer(const ShaderComposer& sa,const CopyOp& copyop=CopyOp::SHALLOW_COPY);
+-        META_Object(osg, ShaderComposer)
++        META_Object(osg, ShaderComposer);
+ 
+         virtual osg::Program* getOrCreateProgram(const ShaderComponents& shaderComponents);
+ 
+diff -Naur OpenSceneGraph-3.0.1.orig/include/osgDB/DatabaseRevisions OpenSceneGraph-3.0.1/include/osgDB/DatabaseRevisions
+--- OpenSceneGraph-3.0.1.orig/include/osgDB/DatabaseRevisions	2011-01-31 12:40:35.000000000 +0100
++++ OpenSceneGraph-3.0.1/include/osgDB/DatabaseRevisions	2011-08-17 06:06:01.048833641 +0200
+@@ -29,7 +29,7 @@
+         FileList();
+         FileList(const FileList& fileList, const osg::CopyOp=osg::CopyOp::SHALLOW_COPY);
+ 
+-        META_Object(osgDB, FileList)
++        META_Object(osgDB, FileList);
+ 
+         typedef std::set<std::string> FileNames;
+         FileNames& getFileNames() { return _files; }
+diff -Naur OpenSceneGraph-3.0.1.orig/include/osgManipulator/Dragger OpenSceneGraph-3.0.1/include/osgManipulator/Dragger
+--- OpenSceneGraph-3.0.1.orig/include/osgManipulator/Dragger	2011-06-23 13:10:54.000000000 +0200
++++ OpenSceneGraph-3.0.1/include/osgManipulator/Dragger	2011-08-17 06:07:07.660913218 +0200
+@@ -297,7 +297,7 @@
+ {
+     public:
+ 
+-        META_Node(osgManipulator,CompositeDragger)
++        META_Node(osgManipulator,CompositeDragger);
+ 
+         typedef std::vector< osg::ref_ptr<Dragger> > DraggerList;
+ 
+diff -Naur OpenSceneGraph-3.0.1.orig/include/osgManipulator/Translate1DDragger OpenSceneGraph-3.0.1/include/osgManipulator/Translate1DDragger
+--- OpenSceneGraph-3.0.1.orig/include/osgManipulator/Translate1DDragger	2010-04-28 22:16:44.000000000 +0200
++++ OpenSceneGraph-3.0.1/include/osgManipulator/Translate1DDragger	2011-08-17 06:07:35.135358878 +0200
+@@ -30,7 +30,7 @@
+ 
+         Translate1DDragger();
+ 
+-        META_OSGMANIPULATOR_Object(osgManipulator,Translate1DDragger)
++        META_OSGMANIPULATOR_Object(osgManipulator,Translate1DDragger);
+ 
+         Translate1DDragger(const osg::Vec3d& s, const osg::Vec3d& e);
+ 
+diff -Naur OpenSceneGraph-3.0.1.orig/include/osgText/Style OpenSceneGraph-3.0.1/include/osgText/Style
+--- OpenSceneGraph-3.0.1.orig/include/osgText/Style	2011-01-31 12:40:35.000000000 +0100
++++ OpenSceneGraph-3.0.1/include/osgText/Style	2011-08-17 06:08:13.416979657 +0200
+@@ -70,7 +70,7 @@
+         Style();
+         Style(const Style& style, const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY);
+ 
+-        META_Object(osgText, Style)
++        META_Object(osgText, Style);
+ 
+         /// default Layout implementation used if no other is specified on TextNode
+         static osg::ref_ptr<Style>& getDefaultStyle();
diff --git a/OpenSceneGraph.spec b/OpenSceneGraph.spec
index bf61660..9131a99 100644
--- a/OpenSceneGraph.spec
+++ b/OpenSceneGraph.spec
@@ -4,12 +4,12 @@
 # package are under the same license as the package itself.
 #
 
-%define apivers 2.8.5
-%define srcvers 2.8.5
+%define apivers 3.0.1
+%define srcvers 3.0.1
 
 Name:           OpenSceneGraph
 Version:        %{apivers}
-Release:        3%{?dist}
+Release:        1%{?dist}
 Summary:        High performance real-time graphics toolkit
 
 Group:          Applications/Multimedia
@@ -48,16 +48,9 @@ BuildRequires:  fltk-devel
 
 BuildRequires:  gnuplot
 
-# OSG packaging madness ;)
-%define OSGSRCDIR       OpenSceneGraph-%{version}
-
 # According to the FPG, this should be defined, but it's not.
 %define _fontdir /usr/share/fonts
 
-%if "%{name}" == "OpenSceneGraph"
-Provides:       OpenSceneGraph2 = %{version}-%{release}
-%endif
-
 %description
 The OpenSceneGraph is an OpenSource, cross platform graphics toolkit for the 
 development of high performance graphics applications such as flight 
@@ -69,18 +62,21 @@ for rapid development of graphics applications.
 
 %prep
 %setup -q -c
-cd %{OSGSRCDIR}
+cd OpenSceneGraph-%{version}
 %{?PATCH0:%patch0 -p1}
+
 sed -i -e 's,\.:/usr/share/fonts/ttf:,.:%{_fontdir}:/usr/share/fonts/ttf:,' \
-src/osgText/Font.cpp \
-src/osgText/Font3D.cpp
+src/osgText/Font.cpp
+
+iconv -f ISO-8859-1 -t utf-8 AUTHORS.txt > AUTHORS.txt~
+mv AUTHORS.txt~ AUTHORS.txt
 cd ..
 
 %build
 mkdir -p BUILD
 pushd BUILD
-
-%cmake -DBUILD_OSG_EXAMPLES=ON -DBUILD_OSG_WRAPPERS=ON -DBUILD_DOCUMENTATION=ON ../%{OSGSRCDIR}
+CFLAGS="${RPM_OPT_FLAGS} -pthread"
+%cmake -DBUILD_OSG_EXAMPLES=ON -DBUILD_DOCUMENTATION=ON ../OpenSceneGraph-%{version} -Wno-dev
 make VERBOSE=1 %{?_smp_mflags}
 
 make doc_openscenegraph doc_openthreads
@@ -97,19 +93,17 @@ popd
 
 %files
 %defattr(-,root,root,-)
-%doc %{OSGSRCDIR}/{AUTHORS,LICENSE,NEWS,README}.txt
+%doc OpenSceneGraph-%{version}/{AUTHORS,LICENSE,NEWS,README}.txt
 %{_bindir}/osgarchive
 %{_bindir}/osgconv
 %{_bindir}/osgversion
 %{_bindir}/osgviewer
 %{_bindir}/osgfilecache
+%{_bindir}/present3D
 
 %package libs
-Summary:        Devel files for OpenSceneGraph
+Summary:        Runtime libraries for OpenSceneGraph
 Group:          Applications/Multimedia
-%if "%{name}" == "OpenSceneGraph"
-Provides:	OpenSceneGraph2-libs = %{version}-%{release}
-%endif
 
 %description libs
 Runtime libraries files for OpenSceneGraph.
@@ -121,16 +115,28 @@ Runtime libraries files for OpenSceneGraph.
 %files libs
 %defattr(-,root,root,-)
 %{_libdir}/osgPlugins-%{apivers}
-%{_libdir}/libosg*.so.*
+%exclude %{_libdir}/osgPlugins-%{apivers}/osgdb_qfont.so
+%{_libdir}/libosgAnimation.so.*
+%{_libdir}/libosgDB.so.*
+%{_libdir}/libosgFX.so.*
+%{_libdir}/libosgGA.so.*
+%{_libdir}/libosgManipulator.so.*
+%{_libdir}/libosgParticle.so.*
+%{_libdir}/libosgPresentation.so.*
+%{_libdir}/libosgShadow.so.*
+%{_libdir}/libosgSim.so.*
+%{_libdir}/libosg.so.*
+%{_libdir}/libosgTerrain.so.*
+%{_libdir}/libosgText.so.*
+%{_libdir}/libosgUtil.so.*
+%{_libdir}/libosgViewer.so.*
+%{_libdir}/libosgVolume.so.*
+%{_libdir}/libosgWidget.so.*
 
 %package devel
-Summary:        Devel files for OpenSceneGraph
+Summary:        Development files for OpenSceneGraph
 Group:          Applications/Multimedia
-%if "%{name}" == "OpenSceneGraph"
-Provides:	OpenSceneGraph2-devel = %{version}-%{release}
-%endif
-Requires:	OpenSceneGraph2-libs = %{version}-%{release}
-Requires:	pkgconfig
+Requires:	OpenSceneGraph-libs = %{version}-%{release}
 Requires:	OpenThreads-devel
 
 %description devel
@@ -139,19 +145,62 @@ Development files for OpenSceneGraph.
 %files devel
 %defattr(-,root,root,-)
 %doc BUILD/doc/OpenSceneGraphReferenceDocs
-%{_includedir}/osg*
+%{_includedir}/osg
+%{_includedir}/osgAnimation
+%{_includedir}/osgDB
+%{_includedir}/osgFX
+%{_includedir}/osgGA
+%{_includedir}/osgManipulator
+%{_includedir}/osgParticle
+%{_includedir}/osgPresentation
+%{_includedir}/osgShadow
+%{_includedir}/osgSim
+%{_includedir}/osgTerrain
+%{_includedir}/osgText
+%{_includedir}/osgUtil
+%{_includedir}/osgViewer
+%{_includedir}/osgVolume
+%{_includedir}/osgWidget
+%{_libdir}/libosgAnimation.so
+%{_libdir}/libosgDB.so
+%{_libdir}/libosgFX.so
+%{_libdir}/libosgGA.so
+%{_libdir}/libosgManipulator.so
+%{_libdir}/libosgParticle.so
+%{_libdir}/libosgPresentation.so
+%{_libdir}/libosgShadow.so
+%{_libdir}/libosgSim.so
+%{_libdir}/libosg.so
+%{_libdir}/libosgTerrain.so
+%{_libdir}/libosgText.so
+%{_libdir}/libosgUtil.so
+%{_libdir}/libosgViewer.so
+%{_libdir}/libosgVolume.so
+%{_libdir}/libosgWidget.so
+%{_libdir}/pkgconfig/openscenegraph-osgAnimation.pc
+%{_libdir}/pkgconfig/openscenegraph-osgDB.pc
+%{_libdir}/pkgconfig/openscenegraph-osgFX.pc
+%{_libdir}/pkgconfig/openscenegraph-osgGA.pc
+%{_libdir}/pkgconfig/openscenegraph-osgManipulator.pc
+%{_libdir}/pkgconfig/openscenegraph-osgParticle.pc
+%{_libdir}/pkgconfig/openscenegraph-osg.pc
+%{_libdir}/pkgconfig/openscenegraph-osgShadow.pc
+%{_libdir}/pkgconfig/openscenegraph-osgSim.pc
+%{_libdir}/pkgconfig/openscenegraph-osgTerrain.pc
+%{_libdir}/pkgconfig/openscenegraph-osgText.pc
+%{_libdir}/pkgconfig/openscenegraph-osgUtil.pc
+%{_libdir}/pkgconfig/openscenegraph-osgViewer.pc
+%{_libdir}/pkgconfig/openscenegraph-osgVolume.pc
+%{_libdir}/pkgconfig/openscenegraph-osgWidget.pc
 %{_libdir}/pkgconfig/openscenegraph.pc
-%{_libdir}/libosg*.so
+
 
 %package examples-SDL
 Summary:        OSG sample applications using SDL
 Group:          Applications/Multimedia
-%if "%{name}" == "OpenSceneGraph"
-Provides:       OpenSceneGraph2-examples-SDL = %{version}-%{release}
-%endif
 
 %description examples-SDL
-OSG sample applications using SDL
+OSG sample applications using SDL.
 
 %files examples-SDL
 %defattr(-,root,root,-)
@@ -160,12 +209,9 @@ OSG sample applications using SDL
 %package examples-fltk
 Summary:        OSG sample applications using FLTK
 Group:          Applications/Multimedia
-%if "%{name}" == "OpenSceneGraph"
-Provides:       OpenSceneGraph2-examples-fltk = %{version}-%{release}
-%endif
 
 %description examples-fltk
-OSG sample applications using FLTK
+OSG sample applications using FLTK.
 
 %files examples-fltk
 %defattr(-,root,root,-)
@@ -174,9 +220,6 @@ OSG sample applications using FLTK
 %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
@@ -185,27 +228,55 @@ OSG sample applications using gtk
 %defattr(-,root,root,-)
 %{_bindir}/osgviewerGTK
 
+%package qt
+Summary:        OSG Qt bindings
+Group:          Applications/Multimedia
+
+%description qt
+OSG Qt bindings.
+
+%files qt
+%defattr(-,root,root,-)
+%{_libdir}/libosgQt.so.*
+%dir %{_libdir}/osgPlugins-%{apivers}
+%{_libdir}/osgPlugins-%{apivers}/osgdb_qfont.so
+
+%post qt -p /sbin/ldconfig
+
+%postun qt -p /sbin/ldconfig
+
+%package qt-devel
+Summary:        OSG Qt development files
+Group:          Applications/Multimedia
+Requires:       OpenSceneGraph-qt = %{version}-%{release}
+Requires:       OpenSceneGraph-devel = %{version}-%{release}
+Requires:       qt-devel
+
+%description qt-devel
+Development files for OSG Qt bindings.
+
+%files qt-devel
+%defattr(-,root,root,-)
+%{_includedir}/osgQt
+%{_libdir}/libosgQt.so
+%{_libdir}/pkgconfig/openscenegraph-osgQt.pc
+
+
 %package examples-qt
 Summary:        OSG sample applications using qt
 Group:          Applications/Multimedia
-%if "%{name}" == "OpenSceneGraph"
-Provides:       OpenSceneGraph2-examples-qt = %{version}-%{release}
-%endif
 
 %description examples-qt
 OSG sample applications using qt
 
 %files examples-qt
 %defattr(-,root,root,-)
-%{_bindir}/osgviewerQT
+%{_bindir}/osgviewerQt
 
 # OpenSceneGraph-examples
 %package examples
 Summary:        Sample applications for OpenSceneGraph
 Group:          Applications/Multimedia
-%if "%{name}" == "OpenSceneGraph"
-Provides:       OpenSceneGraph2-examples = %{version}-%{release}
-%endif
 
 %description examples
 Sample applications for OpenSceneGraph
@@ -213,39 +284,18 @@ Sample applications for OpenSceneGraph
 %files examples
 %defattr(-,root,root,-)
 %{_bindir}/osg2cpp
+%{_bindir}/osganalysis
+%{_bindir}/osganimate
+%{_bindir}/osganimationeasemotion
 %{_bindir}/osganimationhardware
 %{_bindir}/osganimationmakepath
+%{_bindir}/osganimationmorph
 %{_bindir}/osganimationnode
 %{_bindir}/osganimationskinning
 %{_bindir}/osganimationsolid
 %{_bindir}/osganimationtimeline
 %{_bindir}/osganimationviewer
 %{_bindir}/osgautocapture
-%{_bindir}/osgbrowser
-%{_bindir}/osgcluster
-%{_bindir}/osgdrawinstanced
-%{_bindir}/osggameoflife
-%{_bindir}/osgmemorytest
-%{_bindir}/osgpackeddepthstencil
-%{_bindir}/osgpdf
-%{_bindir}/osgrobot
-%{_bindir}/osgsidebyside
-%{_bindir}/osgwidgetmessagebox
-%{_bindir}/osgwidgetperformance
-%{_bindir}/osgfont
-%{_bindir}/osggeometryshaders
-%{_bindir}/osgimagesequence
-%{_bindir}/osgkdtree
-%{_bindir}/osgmultiplerendertargets
-%{_bindir}/osgmultitexturecontrol
-%{_bindir}/osgocclusionquery
-%{_bindir}/osgscreencapture
-%{_bindir}/osgsharedarray
-%{_bindir}/osgstereomatch
-%{_bindir}/osgtext3D
-%{_bindir}/osgthirdpersonview
-%{_bindir}/osgdepthpeeling
-%{_bindir}/osganimate
 %{_bindir}/osgautotransform
 %{_bindir}/osgbillboard
 %{_bindir}/osgblendequation
@@ -253,22 +303,33 @@ Sample applications for OpenSceneGraph
 %{_bindir}/osgcamera
 %{_bindir}/osgcatch
 %{_bindir}/osgclip
+%{_bindir}/osgcluster
 %{_bindir}/osgcompositeviewer
 %{_bindir}/osgcopy
 %{_bindir}/osgcubemap
+%{_bindir}/osgdatabaserevisions
 %{_bindir}/osgdelaunay
 %{_bindir}/osgdepthpartition
+%{_bindir}/osgdepthpeeling
 %{_bindir}/osgdistortion
+%{_bindir}/osgdrawinstanced
 %{_bindir}/osgfadetext
+%{_bindir}/osgfont
 %{_bindir}/osgforest
+%{_bindir}/osgfpdepth
 %{_bindir}/osgfxbrowser
+%{_bindir}/osggameoflife
 %{_bindir}/osggeodemo
 %{_bindir}/osggeometry
+%{_bindir}/osggeometryshaders
+%{_bindir}/osggpx
+%{_bindir}/osggraphicscost
 %{_bindir}/osghangglide
 %{_bindir}/osghud
+%{_bindir}/osgimagesequence
 %{_bindir}/osgimpostor
 %{_bindir}/osgintersection
-%{_bindir}/osgintrospection
+%{_bindir}/osgkdtree
 %{_bindir}/osgkeyboard
 %{_bindir}/osgkeyboardmouse
 %{_bindir}/osglauncher
@@ -277,47 +338,77 @@ Sample applications for OpenSceneGraph
 %{_bindir}/osglogicop
 %{_bindir}/osglogo
 %{_bindir}/osgmanipulator
+%{_bindir}/osgmemorytest
 %{_bindir}/osgmotionblur
 %{_bindir}/osgmovie
+%{_bindir}/osgmultiplerendertargets
 %{_bindir}/osgmultitexture
+%{_bindir}/osgmultitexturecontrol
+%{_bindir}/osgmultiviewpaging
 %{_bindir}/osgoccluder
+%{_bindir}/osgocclusionquery
+%{_bindir}/osgoit
+%{_bindir}/osgoutline
+%{_bindir}/osgpackeddepthstencil
 %{_bindir}/osgpagedlod
 %{_bindir}/osgparametric
 %{_bindir}/osgparticle
 %{_bindir}/osgparticleeffects
+%{_bindir}/osgparticleshader
+%{_bindir}/osgpdf
+%{_bindir}/osgphotoalbum
 %{_bindir}/osgpick
 %{_bindir}/osgplanets
 %{_bindir}/osgpoints
 %{_bindir}/osgpointsprite
+%{_bindir}/osgposter
 %{_bindir}/osgprecipitation
 %{_bindir}/osgprerender
 %{_bindir}/osgprerendercubemap
+%{_bindir}/osgqfont 
 %{_bindir}/osgreflect
+%{_bindir}/osgrobot
 %{_bindir}/osgscalarbar
+%{_bindir}/osgscreencapture
 %{_bindir}/osgscribe
 %{_bindir}/osgsequence
+%{_bindir}/osgshadercomposition
+%{_bindir}/osgshadergen
 %{_bindir}/osgshaders
 %{_bindir}/osgshaderterrain
 %{_bindir}/osgshadow
 %{_bindir}/osgshape
+%{_bindir}/osgsharedarray
+%{_bindir}/osgsidebyside
 %{_bindir}/osgsimplifier
+%{_bindir}/osgsimulation
 %{_bindir}/osgslice
 %{_bindir}/osgspacewarp
 %{_bindir}/osgspheresegment
 %{_bindir}/osgspotlight
 %{_bindir}/osgstereoimage
+%{_bindir}/osgstereomatch
 %{_bindir}/osgteapot
 %{_bindir}/osgterrain
 %{_bindir}/osgtessellate
 %{_bindir}/osgtext
+%{_bindir}/osgtext3D
 %{_bindir}/osgtexture1D
 %{_bindir}/osgtexture2D
 %{_bindir}/osgtexture3D
+%{_bindir}/osgtexturecompression
 %{_bindir}/osgtexturerectangle
+%{_bindir}/osgthirdpersonview
+%{_bindir}/osgthreadedterrain   
+%{_bindir}/osguniformbuffer     
 %{_bindir}/osgunittests
+%{_bindir}/osguserdata
+%{_bindir}/osguserstats
+%{_bindir}/osgvertexattributes
 %{_bindir}/osgvertexprogram
 %{_bindir}/osgviewerGLUT
 %{_bindir}/osgviewerWX
+%{_bindir}/osgvirtualprogram  
 %{_bindir}/osgvolume
 %{_bindir}/osgwidgetaddremove
 %{_bindir}/osgwidgetbox
@@ -326,7 +417,9 @@ Sample applications for OpenSceneGraph
 %{_bindir}/osgwidgetinput
 %{_bindir}/osgwidgetlabel
 %{_bindir}/osgwidgetmenu
+%{_bindir}/osgwidgetmessagebox
 %{_bindir}/osgwidgetnotebook
+%{_bindir}/osgwidgetperformance
 %{_bindir}/osgwidgetscrolled
 %{_bindir}/osgwidgetshader
 %{_bindir}/osgwidgetstyled
@@ -334,12 +427,8 @@ Sample applications for OpenSceneGraph
 %{_bindir}/osgwidgetwindow
 %{_bindir}/osgwindows
 
-%{_bindir}/osgphotoalbum
-%{_bindir}/osgsimulation
-
 %{_datadir}/OpenSceneGraph
 
-
 # OpenThreads
 %package -n OpenThreads
 Summary:        OpenThreads
@@ -359,7 +448,7 @@ compile-time in a shared object library.
 
 %files -n OpenThreads
 %defattr(-,root,root,-)
-%doc %{OSGSRCDIR}/{AUTHORS,LICENSE,NEWS,README}.txt
+%doc OpenSceneGraph-%{version}/{AUTHORS,LICENSE,NEWS,README}.txt
 %{_libdir}/libOpenThreads.so.*
 
 # OpenThreads-devel
@@ -381,6 +470,13 @@ Development files for OpenThreads.
 %{_includedir}/OpenThreads
 
 %changelog
+* Tue Aug 17 2011 Ralf Corsépius <corsepiu at fedoraproject.org> - 3.0.1-1
+- Upstream update.
+- Remove OpenSceneGraph2* tags.
+- Split out OpenSceneGraph-qt, OpenSceneGraph-qt-devel.
+- Pass -Wno-dev to cmake.
+- Append -pthread to CFLAGS.
+
 * Sun Jul 17 2011 Ralf Corsépius <corsepiu at fedoraproject.org> - 2.8.5-3
 - Reflect curl having silently broken their API.
 
diff --git a/sources b/sources
index 9f8ae7f..0b1457f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-de844947d410726ba50ed07eb6319e6f  OpenSceneGraph-2.8.5.zip
+c43a25d023e635c3566b2083d8e6d956  OpenSceneGraph-3.0.1.zip


More information about the scm-commits mailing list