rpms/OpenSceneGraph/F-11 OpenSceneGraph-2.8.2.diff, NONE, 1.1 .cvsignore, 1.15, 1.16 OpenSceneGraph.spec, 1.44, 1.45 sources, 1.15, 1.16 OpenSceneGraph-2.8.1.diff, 1.1, NONE

Tue Aug 18 10:10:46 UTC 2009

Author: corsepiu

Update of /cvs/pkgs/rpms/OpenSceneGraph/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26177

Modified Files:
	.cvsignore OpenSceneGraph.spec sources 
Added Files:
	OpenSceneGraph-2.8.2.diff 
Removed Files:
	OpenSceneGraph-2.8.1.diff 
Log Message:
* Tue Aug 18 2009 Ralf Corsépius <corsepiu at fedoraproject.org> - 2.8.2-2
- Spec file cleanup.

* Mon Aug 17 2009 Ralf Corsépius <corsepiu at fedoraproject.org> - 2.8.2-1
- Upstream update.
- Reflect upstream having changes Source0-URL.



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

--- NEW FILE OpenSceneGraph-2.8.2.diff ---
diff -Naur OpenSceneGraph-2.8.2.orig/CMakeLists.txt OpenSceneGraph-2.8.2/CMakeLists.txt
--- OpenSceneGraph-2.8.2.orig/CMakeLists.txt	2009-07-28 08:02:27.000000000 +0200
+++ OpenSceneGraph-2.8.2/CMakeLists.txt	2009-08-17 17:39:09.000000000 +0200
@@ -717,7 +717,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)
@@ -733,7 +733,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.2.orig/CMakeModules/OsgMacroUtils.cmake OpenSceneGraph-2.8.2/CMakeModules/OsgMacroUtils.cmake
--- OpenSceneGraph-2.8.2.orig/CMakeModules/OsgMacroUtils.cmake	2008-12-12 15:54:22.000000000 +0100
+++ OpenSceneGraph-2.8.2/CMakeModules/OsgMacroUtils.cmake	2009-08-17 17:39:09.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/F-11/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	24 Jun 2009 15:21:27 -0000	1.15
+++ .cvsignore	18 Aug 2009 10:10:46 -0000	1.16
@@ -1 +1 @@
-OpenSceneGraph-2.8.1.zip
+OpenSceneGraph-2.8.2.zip


Index: OpenSceneGraph.spec
===================================================================
RCS file: /cvs/pkgs/rpms/OpenSceneGraph/F-11/OpenSceneGraph.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- OpenSceneGraph.spec	29 Jun 2009 04:45:14 -0000	1.44
+++ OpenSceneGraph.spec	18 Aug 2009 10:10:46 -0000	1.45
@@ -4,8 +4,8 @@
 # package are under the same license as the package itself.
 #
 
-%define apivers 2.8.1
-%define srcvers 2.8.1
+%define apivers 2.8.2
+%define srcvers 2.8.2
 
 Name:           OpenSceneGraph
 Version:        %{apivers}
@@ -16,7 +16,8 @@ Group:          Applications/Multimedia
 # The OSGPL is just the wxWidgets license.
 License:        wxWidgets
 URL:            http://www.openscenegraph.org/
-Source0:        http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-%{srcvers}/source/OpenSceneGraph-%{version}.zip
+Source0:        http://www.openscenegraph.org/downloads/developer_releases/OpenSceneGraph-%{version}.zip
+
 Patch0:         OpenSceneGraph-%{version}.diff
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -43,11 +44,7 @@ BuildRequires:  SDL-devel
 BuildRequires:  fltk-devel
 
 # OSG packaging madness ;)
-%if "%{version}" >= "2.6.0"
 %define OSGSRCDIR       OpenSceneGraph-%{version}
-%else
-%define OSGSRCDIR       OpenSceneGraph
-%endif
 
 %if "%{name}" == "OpenSceneGraph"
 Provides:       OpenSceneGraph2 = %{version}-%{release}
@@ -66,12 +63,6 @@ for rapid development of graphics applic
 %setup -q -c
 cd %{OSGSRCDIR}
 %{?PATCH0:%patch0 -p1}
-%if "%{version}" < "2.8.0"
-sed -i \
-  -e 's,^OUTPUT_DIRECTORY.*doc/,OUTPUT_DIRECTORY = doc,' \
-  -e 's,^HTML_OUTPUT[ ]*= OpenSceneGraphReferenceDocs,HTML_OUTPUT = html,' \
-  doc/Doxyfiles/doxyfile.cmake
-%endif
 cd ..
 
 %build
@@ -81,23 +72,9 @@ pushd BUILD
 %cmake -DBUILD_OSG_EXAMPLES=ON -DBUILD_OSG_WRAPPERS=ON -DBUILD_DOCUMENTATION=ON ../%{OSGSRCDIR}
 make VERBOSE=1 %{?_smp_mflags}
 
-%if "%{version}" >= "2.8.0"
 make doc_openscenegraph doc_openthreads
-%else
-make DoxygenDoc
-%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},' \
-  -e 's,^includedir=.*$,includedir=%{_includedir},' \
-  -e '/^Conflicts.*$/d' \
-  %{OSGSRCDIR}/packaging/pkgconfig/openscenegraph.pc \
-  %{OSGSRCDIR}/packaging/pkgconfig/openthreads.pc
-%endif
-
 %install
 rm -rf $RPM_BUILD_ROOT
 pushd BUILD
@@ -107,14 +84,6 @@ make install DESTDIR=${RPM_BUILD_ROOT}
 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
 
@@ -163,11 +132,7 @@ 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
@@ -227,7 +192,6 @@ Sample applications for OpenSceneGraph
 
 %files examples
 %defattr(-,root,root,-)
-%if "%{version}" >= "2.8.0"
 %{_bindir}/osg2cpp
 %{_bindir}/osganimationmakepath
 %{_bindir}/osganimationnode
@@ -247,7 +211,6 @@ Sample applications for OpenSceneGraph
 %{_bindir}/osgsidebyside
 %{_bindir}/osgwidgetmessagebox
 %{_bindir}/osgwidgetperformance
-%endif
 %{_bindir}/osgfont
 %{_bindir}/osggeometryshaders
 %{_bindir}/osgimagesequence
@@ -391,14 +354,19 @@ Development files for OpenThreads.
 
 %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
+* Tue Aug 18 2009 Ralf Corsépius <corsepiu at fedoraproject.org> - 2.8.2-2
+- Spec file cleanup.
+
+* Mon Aug 17 2009 Ralf Corsépius <corsepiu at fedoraproject.org> - 2.8.2-1
+- Upstream update.
+- Reflect upstream having changes Source0-URL.
+
 * Mon Jun 29 2009 Ralf Corsépius <corsepiu at fedoraproject.org> - 2.8.1-2
 - Remove /usr/bin/osgfilecache from *-examples.
 - Further spec cleanup.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/OpenSceneGraph/F-11/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	24 Jun 2009 15:21:27 -0000	1.15
+++ sources	18 Aug 2009 10:10:46 -0000	1.16
@@ -1 +1 @@
-18a8d3f01a72b6027147b3918c18c662  OpenSceneGraph-2.8.1.zip
+99d0b37f403b85b4559514b6b9849d9e  OpenSceneGraph-2.8.2.zip


--- OpenSceneGraph-2.8.1.diff DELETED ---


