rpms/OpenSceneGraph/devel OpenSceneGraph-2.0.diff,1.1,1.2

[Ralf Corsépius (corsepiu)]

Author: corsepiu

Update of /cvs/extras/rpms/OpenSceneGraph/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv858

Modified Files:
	OpenSceneGraph-2.0.diff 
Log Message:
Re-add *.pc.
Hackup doxygen support.

OpenSceneGraph-2.0.diff:

Index: OpenSceneGraph-2.0.diff
===================================================================
RCS file: /cvs/extras/rpms/OpenSceneGraph/devel/OpenSceneGraph-2.0.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- OpenSceneGraph-2.0.diff	21 Jun 2007 09:26:31 -0000	1.1
+++ OpenSceneGraph-2.0.diff	30 Jun 2007 03:33:20 -0000	1.2
@@ -1,5 +1,6 @@
---- OpenSceneGraph/CMakeModules/OsgMacroUtils.cmake.orig	2007-06-20 17:03:49.000000000 +0200
-+++ OpenSceneGraph/CMakeModules/OsgMacroUtils.cmake	2007-06-20 17:04:09.000000000 +0200
+diff -uNr OpenSceneGraph.orig/CMakeModules/OsgMacroUtils.cmake OpenSceneGraph/CMakeModules/OsgMacroUtils.cmake
+--- OpenSceneGraph.orig/CMakeModules/OsgMacroUtils.cmake	2007-06-04 23:02:15.000000000 +0200
++++ OpenSceneGraph/CMakeModules/OsgMacroUtils.cmake	2007-06-29 19:05:08.000000000 +0200
 @@ -230,7 +230,7 @@
              
          SETUP_EXE(${IS_COMMANDLINE_APP})
@@ -9,8 +10,30 @@
  
  ENDMACRO(SETUP_EXAMPLE)
  
---- OpenSceneGraph/examples/CMakeLists.txt.orig	2007-06-21 04:39:39.000000000 +0200
-+++ OpenSceneGraph/examples/CMakeLists.txt	2007-06-21 04:39:39.000000000 +0200
+diff -uNr OpenSceneGraph.orig/doc/Doxyfiles/core_Doxyfile OpenSceneGraph/doc/Doxyfiles/core_Doxyfile
+--- OpenSceneGraph.orig/doc/Doxyfiles/core_Doxyfile	2007-05-29 09:25:13.000000000 +0200
++++ OpenSceneGraph/doc/Doxyfiles/core_Doxyfile	2007-06-29 19:06:01.000000000 +0200
+@@ -30,7 +30,7 @@
+ # If a relative path is entered, it will be relative to the location 
+ # where doxygen was started. If left blank the current directory will be used.
+ 
+-OUTPUT_DIRECTORY       = $(OSGHOME)/doc/
++OUTPUT_DIRECTORY = doc
+ 
+ # The OUTPUT_LANGUAGE tag is used to specify the language in which all 
+ # documentation generated by doxygen is written. Doxygen will use this 
+@@ -556,7 +556,7 @@
+ # If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+ # put in front of it. If left blank `html' will be used as the default path.
+ 
+-HTML_OUTPUT            = OpenSceneGraphReferenceDocs
++HTML_OUTPUT = html
+ 
+ # The HTML_FILE_EXTENSION tag can be used to specify the file extension for 
+ # each generated HTML page (for example: .htm,.php,.asp). If it is left blank 
+diff -uNr OpenSceneGraph.orig/examples/CMakeLists.txt OpenSceneGraph/examples/CMakeLists.txt
+--- OpenSceneGraph.orig/examples/CMakeLists.txt	2007-06-15 15:43:49.000000000 +0200
++++ OpenSceneGraph/examples/CMakeLists.txt	2007-06-29 19:05:08.000000000 +0200
 @@ -82,7 +82,7 @@
      ADD_SUBDIRECTORY(osgspotlight)
      ADD_SUBDIRECTORY(osgstereoimage)
@@ -20,3 +43,39 @@
      ADD_SUBDIRECTORY(osgtext)
      ADD_SUBDIRECTORY(osgtexture1D)
      ADD_SUBDIRECTORY(osgtexture2D)
+diff -uNr OpenSceneGraph.orig/pkgconfig/openscenegraph.pc OpenSceneGraph/pkgconfig/openscenegraph.pc
+--- OpenSceneGraph.orig/pkgconfig/openscenegraph.pc	1970-01-01 01:00:00.000000000 +0100
++++ OpenSceneGraph/pkgconfig/openscenegraph.pc	2007-06-29 19:08:12.000000000 +0200
+@@ -0,0 +1,14 @@
++# pkg-config source file
++
++prefix=/usr
++exec_prefix=${prefix}
++libdir=${exec_prefix}/lib
++includedir=${prefix}/include
++
++Name: openscenegraph
++Description: 3D scenegraph
++Version: 2.0
++Requires: openthreads
++Conflicts:
++Libs: -L${libdir} -losg -losgDB -losgFX -losgGA -losgParticle -losgSim -losgText -losgUtil
++Cflags: -I${includedir}
+diff -uNr OpenSceneGraph.orig/pkgconfig/openthreads.pc OpenSceneGraph/pkgconfig/openthreads.pc
+--- OpenSceneGraph.orig/pkgconfig/openthreads.pc	1970-01-01 01:00:00.000000000 +0100
++++ OpenSceneGraph/pkgconfig/openthreads.pc	2007-06-30 04:39:52.000000000 +0200
+@@ -0,0 +1,14 @@
++# pkg-config source file
++
++prefix=/usr
++exec_prefix=${prefix}
++libdir=${exec_prefix}/lib
++includedir=${prefix}/include
++
++Name: openthreads
++Description: Object-Oriented (OO) thread interface for C++ programmers
++Version: 2.0
++Requires:
++Conflicts:
++Libs: -L${libdir} -lOpenThreads
++Cflags: -I${includedir}