rpms/OpenSceneGraph/devel OpenSceneGraph-2.8.1.diff, NONE, 1.1 .cvsignore, 1.14, 1.15 OpenSceneGraph.spec, 1.42, 1.43 sources, 1.14, 1.15 OpenSceneGraph-2.8.0.diff, 1.1, NONE

corsepiu corsepiu at fedoraproject.org
Wed Jun 24 08:29:14 UTC 2009 

Author: corsepiu

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

Modified Files:
	.cvsignore OpenSceneGraph.spec sources 
Added Files:
	OpenSceneGraph-2.8.1.diff 
Removed Files:
	OpenSceneGraph-2.8.0.diff 
Log Message:
* Wed Jun 24 2009 Ralf Corsépius <corsepiu at fedoraproject.org> - 2.8.1-1
- Upstream update.
- Reflect upstream having consolidated their Source0:-URL.
- Stop supporting OSG < 2.6.0.


OpenSceneGraph-2.8.1.diff:

--- NEW FILE OpenSceneGraph-2.8.1.diff ---
diff -Naur OpenSceneGraph-2.8.1.orig/CMakeLists.txt OpenSceneGraph-2.8.1/CMakeLists.txt
--- OpenSceneGraph-2.8.1.orig/CMakeLists.txt	2009-05-19 18:05:19.000000000 +0200
+++ OpenSceneGraph-2.8.1/CMakeLists.txt	2009-06-24 05:58:02.000000000 +0200
@@ -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.1.orig/CMakeModules/OsgMacroUtils.cmake OpenSceneGraph-2.8.1/CMakeModules/OsgMacroUtils.cmake
--- OpenSceneGraph-2.8.1.orig/CMakeModules/OsgMacroUtils.cmake	2008-12-12 15:54:22.000000000 +0100
+++ OpenSceneGraph-2.8.1/CMakeModules/OsgMacroUtils.cmake	2009-06-24 05:58:02.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)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/OpenSceneGraph/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	15 Feb 2009 04:10:59 -0000	1.14
+++ .cvsignore	24 Jun 2009 08:28:43 -0000	1.15
@@ -1 +1 @@
-OpenSceneGraph-2.8.0.zip
+OpenSceneGraph-2.8.1.zip


Index: OpenSceneGraph.spec
===================================================================
RCS file: /cvs/pkgs/rpms/OpenSceneGraph/devel/OpenSceneGraph.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- OpenSceneGraph.spec	23 Feb 2009 22:17:36 -0000	1.42
+++ OpenSceneGraph.spec	24 Jun 2009 08:28:44 -0000	1.43
@@ -4,23 +4,19 @@
 # package are under the same license as the package itself.
 #
 
-%define apivers 2.8.0
-%define srcvers 2.8.0
+%define apivers 2.8.1
+%define srcvers 2.8.1
 
 Name:           OpenSceneGraph
 Version:        %{apivers}
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        High performance real-time graphics toolkit
 
 Group:          Applications/Multimedia
 # 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
+Source0:        http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-%{srcvers}/source/OpenSceneGraph-%{version}.zip
 Patch0:         OpenSceneGraph-%{version}.diff
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -38,9 +34,7 @@ BuildRequires:  libpng-devel
 BuildRequires:  doxygen graphviz
 BuildRequires:  cmake
 BuildRequires:  wxGTK-devel
-%if "%{version}" >= "2.4.0"
 BuildRequires:  curl-devel
-%endif
 
 BuildRequires:	qt-devel
 
@@ -52,15 +46,7 @@ BuildRequires:  fltk-devel
 %if "%{version}" >= "2.6.0"
 %define OSGSRCDIR       OpenSceneGraph-%{version}
 %else
-%if "%{version}" >= "2.4.0"
 %define OSGSRCDIR       OpenSceneGraph
-%else
-%if "%{version}" >= "2.2.0"
-%define OSGSRCDIR	OpenSceneGraph-%{version}
-%else
-%define OSGSRCDIR	OpenSceneGraph
-%endif
-%endif
 %endif
 
 %if "%{name}" == "OpenSceneGraph"
@@ -81,36 +67,24 @@ for rapid development of graphics applic
 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
 mkdir -p BUILD
 pushd BUILD
 
-%if "%{version}" >= "2.4.0"
 %cmake -DBUILD_OSG_EXAMPLES=ON -DBUILD_OSG_WRAPPERS=ON -DBUILD_DOCUMENTATION=ON ../%{OSGSRCDIR}
-%else
-# Should add -DBUILD_DOCUMENTATION=ON, but it's broken
-%cmake -DBUILD_OSG_EXAMPLES=ON -DBUILD_OSG_WRAPPERS=ON ../%{OSGSRCDIR}
-%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
 
@@ -122,12 +96,6 @@ sed -i -e 's,^prefix=.*$,prefix=%{_prefi
   -e '/^Conflicts.*$/d' \
   %{OSGSRCDIR}/packaging/pkgconfig/openscenegraph.pc \
   %{OSGSRCDIR}/packaging/pkgconfig/openthreads.pc
-%if "%{version}" < "2.2.0"
-sed -i -e 's,Version:.*,Version: 2.0.0,' \
-  %{OSGSRCDIR}/packaging/pkgconfig/openscenegraph.pc
-sed -i -e 's,Version:.*,Version: 1.9.5,' \
-  %{OSGSRCDIR}/packaging/pkgconfig/openthreads.pc
-%endif
 %endif
 
 %install
@@ -302,7 +270,6 @@ Sample applications for OpenSceneGraph
 %{_bindir}/osgwidgettable
 %{_bindir}/osgwidgetwindow
 %endif
-%if "%{version}" >= "2.4.0"
 %{_bindir}/osggeometryshaders
 %{_bindir}/osgmultiplerendertargets
 %{_bindir}/osgmultitexturecontrol
@@ -311,10 +278,7 @@ Sample applications for OpenSceneGraph
 %{_bindir}/osgstereomatch
 %{_bindir}/osgtext3D
 %{_bindir}/osgthirdpersonview
-%endif
-%if "%{version}" >= "2.2.0"
 %{_bindir}/osgdepthpeeling
-%endif
 %{_bindir}/osganimate
 %{_bindir}/osgautotransform
 %{_bindir}/osgbillboard
@@ -332,9 +296,6 @@ Sample applications for OpenSceneGraph
 %{_bindir}/osgcubemap
 %{_bindir}/osgdelaunay
 %{_bindir}/osgdepthpartition
-%if "%{version}" < "2.2.0"
-%{_bindir}/osgdepthshadow
-%endif
 %{_bindir}/osgdistortion
 %{_bindir}/osgfadetext
 %{_bindir}/osgforest
@@ -376,9 +337,6 @@ Sample applications for OpenSceneGraph
 %{_bindir}/osgshaders
 %{_bindir}/osgshaderterrain
 %{_bindir}/osgshadow
-%if "%{version}" < "2.2.0"
-%{_bindir}/osgshadowtexture
-%endif
 %{_bindir}/osgshape
 %{_bindir}/osgsimplifier
 %{_bindir}/osgslice
@@ -450,6 +408,11 @@ Development files for OpenThreads.
 %{_includedir}/OpenThreads
 
 %changelog
+* Wed Jun 24 2009 Ralf Corsépius <corsepiu at fedoraproject.org> - 2.8.1-1
+- Upstream update.
+- Reflect upstream having consolidated their Source0:-URL.
+- Stop supporting OSG < 2.6.0.
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.8.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/OpenSceneGraph/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	15 Feb 2009 04:10:59 -0000	1.14
+++ sources	24 Jun 2009 08:28:44 -0000	1.15
@@ -1 +1 @@
-c4c20b97274346701f6d57eab3e78bcd  OpenSceneGraph-2.8.0.zip
+18a8d3f01a72b6027147b3918c18c662  OpenSceneGraph-2.8.1.zip


--- OpenSceneGraph-2.8.0.diff DELETED ---

More information about the fedora-extras-commits mailing list