rpms/OpenSceneGraph/devel OpenSceneGraph-2.8.0.diff, NONE, 1.1 .cvsignore, 1.13, 1.14 OpenSceneGraph.spec, 1.40, 1.41 sources, 1.13, 1.14 OpenSceneGraph-2.6.0.diff, 1.1, NONE

Ralf Corsépius corsepiu at fedoraproject.org
Sun Feb 15 04:11:30 UTC 2009 

Author: corsepiu

Update of /cvs/pkgs/rpms/OpenSceneGraph/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14202

Modified Files:
	.cvsignore OpenSceneGraph.spec sources 
Added Files:
	OpenSceneGraph-2.8.0.diff 
Removed Files:
	OpenSceneGraph-2.6.0.diff 
Log Message:
* Sun Feb 15 2009 Ralf Corsépius <rc040203 at freenet.de> - 2.8.0-1
- Upgrade to OSG-2.8.0.
- Remove Obsolete: Producer hacks.


OpenSceneGraph-2.8.0.diff:

--- NEW FILE OpenSceneGraph-2.8.0.diff ---
diff -Naur OpenSceneGraph-2.8.0.orig/CMakeLists.txt OpenSceneGraph-2.8.0/CMakeLists.txt
--- OpenSceneGraph-2.8.0.orig/CMakeLists.txt	2009-02-12 11:17:41.000000000 +0100
+++ OpenSceneGraph-2.8.0/CMakeLists.txt	2009-02-14 07:07:25.000000000 +0100
@@ -715,7 +715,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)
@@ -731,7 +731,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.0.orig/CMakeModules/OsgMacroUtils.cmake OpenSceneGraph-2.8.0/CMakeModules/OsgMacroUtils.cmake
--- OpenSceneGraph-2.8.0.orig/CMakeModules/OsgMacroUtils.cmake	2008-12-12 15:54:22.000000000 +0100
+++ OpenSceneGraph-2.8.0/CMakeModules/OsgMacroUtils.cmake	2009-02-13 16:32:23.000000000 +0100
@@ -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)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/OpenSceneGraph/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	14 Aug 2008 03:49:58 -0000	1.13
+++ .cvsignore	15 Feb 2009 04:10:59 -0000	1.14
@@ -1 +1 @@
-OpenSceneGraph-2.6.0.zip
+OpenSceneGraph-2.8.0.zip


Index: OpenSceneGraph.spec
===================================================================
RCS file: /cvs/pkgs/rpms/OpenSceneGraph/devel/OpenSceneGraph.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- OpenSceneGraph.spec	14 Aug 2008 03:49:58 -0000	1.40
+++ OpenSceneGraph.spec	15 Feb 2009 04:10:59 -0000	1.41
@@ -1,17 +1,11 @@
 #
-# Copyright (c) 2005, 2006, 2007, 2008 Ralf Corsepius, Ulm, Germany.
+# Copyright (c) 2005, 2006, 2007, 2008, 2009 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.6.0
-%define srcvers 2.6
-
-# HACK: Work around to yum not being able to remove packages
-%define _obsolete_Producer 1
-
-# Force pushing out OSG1's Producer
-%define OSG1_Producer 1:1.2-0
+%define apivers 2.8.0
+%define srcvers 2.8.0
 
 Name:           OpenSceneGraph
 Version:        %{apivers}
@@ -22,7 +16,11 @@
 # The OSGPL is just the wxWidgets license.
 License:        wxWidgets
 URL:            http://www.openscenegraph.org/
+%if "%{version}" >= "2.6.1"
+Source0:        http://www.openscenegraph.org/downloads/developer_releases/OpenSceneGraph-%{version}.zip
+%else
 Source0:        http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-%{srcvers}/OpenSceneGraph-%{version}.zip
+%endif
 Patch0:         OpenSceneGraph-%{version}.diff
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -82,12 +80,14 @@
 %setup -q -c
 cd %{OSGSRCDIR}
 %{?PATCH0:%patch0 -p1}
+%if "%{version}" < "2.8.0"
 %if "%{version}" >= "2.4.0"
 sed -i \
   -e 's,^OUTPUT_DIRECTORY.*doc/,OUTPUT_DIRECTORY = doc,' \
   -e 's,^HTML_OUTPUT[ ]*= OpenSceneGraphReferenceDocs,HTML_OUTPUT = html,' \
   doc/Doxyfiles/doxyfile.cmake
 %endif
+%endif
 cd ..
 
 %build
@@ -102,14 +102,19 @@
 %endif
 make VERBOSE=1 %{?_smp_mflags}
 
+%if "%{version}" >= "2.8.0"
+make doc_openscenegraph doc_openthreads
+%else
 %if "%{version}" >= "2.4.0"
 make DoxygenDoc
 %else
 # Manually invoke doxygen, because doc-building is broken in OSG's cmake stuff
 OSGHOME=../%{OSGSRCDIR} doxygen ../%{OSGSRCDIR}/doc/Doxyfiles/core_Doxyfile
 %endif
+%endif
 popd
 
+%if "%{version}" < "2.8.0"
 # HACK: Upstream stuff lacks cmake support and is broken
 sed -i -e 's,^prefix=.*$,prefix=%{_prefix},' \
   -e 's,^libdir=.*$,libdir=%{_libdir},' \
@@ -123,6 +128,7 @@
 sed -i -e 's,Version:.*,Version: 1.9.5,' \
   %{OSGSRCDIR}/packaging/pkgconfig/openthreads.pc
 %endif
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -133,12 +139,13 @@
 mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/OpenSceneGraph
 popd
 
+%if "%{version}" < "2.8.0"
 # Abandoned w/ 2.0 by upstream, re-added to 2.1.*
 install -m 644 -D %{OSGSRCDIR}/packaging/pkgconfig/openthreads.pc \
   ${RPM_BUILD_ROOT}%{_libdir}/pkgconfig/openthreads.pc
 install -m 644 -D %{OSGSRCDIR}/packaging/pkgconfig/openscenegraph.pc \
   ${RPM_BUILD_ROOT}%{_libdir}/pkgconfig/openscenegraph.pc
-
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -162,12 +169,6 @@
 %if "%{name}" == "OpenSceneGraph"
 Provides:	OpenSceneGraph2-libs = %{version}-%{release}
 %endif
-%if %{?_obsolete_Producer}
-# HACK: Upstream abandoned Producer, but yum doesn't want to remove packages.
-# Required to let yum remove Producer (from OSG-1)
-Obsoletes:	Producer <= %{OSG1_Producer}
-%endif
-
 
 %description libs
 Runtime libraries files for OpenSceneGraph.
@@ -190,19 +191,17 @@
 Requires:	OpenSceneGraph2-libs = %{version}-%{release}
 Requires:	pkgconfig
 Requires:	OpenThreads-devel
-%if %{?_obsolete_Producer}
-# HACK: Upstream abandoned Producer, but yum doesn't want to remove packages.
-# Required to let yum remove Producer (from OSG-1)
-Obsoletes:	Producer-devel <= %{OSG1_Producer}
-%endif
-
 
 %description devel
 Development files for OpenSceneGraph.
 
 %files devel
 %defattr(-,root,root,-)
+%if "%{version}" >= "2.8.0"
+%doc BUILD/doc/OpenSceneGraphReferenceDocs
+%else
 %doc BUILD/doc/html
+%endif
 %{_includedir}/osg*
 %{_libdir}/pkgconfig/openscenegraph.pc
 %{_libdir}/libosg*.so
@@ -262,6 +261,27 @@
 
 %files examples
 %defattr(-,root,root,-)
+%if "%{version}" >= "2.8.0"
+%{_bindir}/osg2cpp
+%{_bindir}/osganimationmakepath
+%{_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
+%endif
 %if "%{version}" >= "2.6.0"
 %{_bindir}/osgfilecache
 %{_bindir}/osgfont
@@ -422,11 +442,18 @@
 
 %files -n OpenThreads-devel
 %defattr(-,root,root,-)
+%if "%{version}" >= "2.8.0"
+%doc BUILD/doc/OpenThreadsReferenceDocs
+%endif
 %{_libdir}/pkgconfig/openthreads.pc
 %{_libdir}/libOpenThreads.so
 %{_includedir}/OpenThreads
 
 %changelog
+* Sun Feb 15 2009 Ralf Corsépius <rc040203 at freenet.de> - 2.8.0-1
+- Upgrade to OSG-2.8.0.
+- Remove Obsolete: Producer hacks.
+
 * Wed Aug 14 2008 Ralf Corsépius <rc040203 at freenet.de> - 2.6.0-1
 - Upgrade to OSG-2.6.0.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/OpenSceneGraph/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	14 Aug 2008 03:49:58 -0000	1.13
+++ sources	15 Feb 2009 04:10:59 -0000	1.14
@@ -1 +1 @@
-b29c7383f4c5f4b42aef9fcebe4a5539  OpenSceneGraph-2.6.0.zip
+c4c20b97274346701f6d57eab3e78bcd  OpenSceneGraph-2.8.0.zip


--- OpenSceneGraph-2.6.0.diff DELETED ---

More information about the fedora-extras-commits mailing list