rpms/OpenSceneGraph/devel OpenSceneGraph.spec,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-serv6001

Modified Files:
	OpenSceneGraph.spec 
Log Message:
- Add full URL to Debian patch.
- Add _with_demeter.
- Extend Producer %%description.
- Extend OpenThreads %%description.



Index: OpenSceneGraph.spec
===================================================================
RCS file: /cvs/extras/rpms/OpenSceneGraph/devel/OpenSceneGraph.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- OpenSceneGraph.spec	28 Aug 2005 04:51:28 -0000	1.1
+++ OpenSceneGraph.spec	28 Aug 2005 04:54:23 -0000	1.2
@@ -1,7 +1,7 @@
 Name:           OpenSceneGraph
 Version:        0.9.9
-Release:        2%{?dist}
-Summary:        A graphics toolkit
+Release:        3%{?dist}
+Summary:        High performance real-time graphics graphics toolkit
 
 Group:          Applications/Multimedia
 License:        OSGPL
@@ -9,7 +9,7 @@
 Source0:        http://www.openscenegraph.org/downloads/snapshots/OSG_OP_OT-%{version}.zip
 
 # Debian patch
-Patch0:		openscenegraph_0.9.9-5.diff.gz
+Patch0:		http://ftp.debian.org/debian/pool/main/o/openscenegraph/openscenegraph_0.9.9-5.diff.gz
 
 # Revert parts of the Debian patch
 Patch1:		OpenSceneGraph-0.9.9-revdeb.diff
@@ -30,6 +30,7 @@
 BuildRequires:	doxygen
 
 %{?_with_gdal:BuildRequires:	gdal-devel}
+%{?_with_demeter:BuildRequires:	demeter-devel}
 
 %description
 The OpenSceneGraph is an OpenSource, cross platform graphics toolkit for the 
@@ -51,23 +52,20 @@
 cp OpenSceneGraph/Make/dependencies \
   OpenSceneGraph/Make/dependencies.bak
 
-%build
-rm -rf $RPM_BUILD_ROOT
-%ifarch x64_86
-export LD_LIBRARY_PATH="$PWD/Producer/lib/Linux64:$PWD/OpenThreads/lib/Linux64"
-%else
-export LD_LIBRARY_PATH="$PWD/Producer/lib/Linux32:$PWD/OpenThreads/lib/Linux32"
-%endif
-
 echo "# Fedora custom settings" > OpenSceneGraph/Make/dependencies
 echo "COMPILE_EXAMPLES = yes" >> OpenSceneGraph/Make/dependencies
 echo "COMPILE_INTROSPECTION = yes" >> OpenSceneGraph/Make/dependencies
 echo "INVENTOR_INSTALLED = yes" >> OpenSceneGraph/Make/dependencies
 echo "GLUT_INSTALLED = yes" >> OpenSceneGraph/Make/dependencies
 %{?_with_gdal:echo "GDAL_INSTALLED = yes" >> OpenSceneGraph/Make/dependencies}
+%{?_with_demeter:echo "DEMETER_INSTALLED = yes" >> OpenSceneGraph/Make/dependencies}
 echo >> OpenSceneGraph/Make/dependencies
 cat OpenSceneGraph/Make/dependencies.bak >> OpenSceneGraph/Make/dependencies
 
+for file in OpenSceneGraph/src/osgWrappers/*/GNUmakefile; do
+  sed -i -e '/^OPTF.*$/d' $file
+done
+
 for dir in OpenThreads Producer OpenSceneGraph; do
 # Add DESTDIR
 # Remove bogus -lstdc++
@@ -88,7 +86,17 @@
   sed -i \
     -e 's, DOF=$(OPTF) , "DOF=$(OPTF)" ,g' \
     $dir/Make/makerules
+done
 
+%build
+rm -rf $RPM_BUILD_ROOT
+%ifarch x64_86
+export LD_LIBRARY_PATH="$PWD/Producer/lib/Linux64:$PWD/OpenThreads/lib/Linux64"
+%else
+export LD_LIBRARY_PATH="$PWD/Producer/lib/Linux32:$PWD/OpenThreads/lib/Linux32"
+%endif
+
+for dir in OpenThreads Producer OpenSceneGraph; do
   make -C $dir \
     COMPILE_OSG_OP_OT_WITH_SONAMES=YES \
     OPENTHREADS_INC_DIR="$PWD/OpenThreads/include" \
@@ -256,7 +264,7 @@
 %{?_with_gdal:%{_bindir}/osgbluemarble}
 %{?_with_gdal:%{_bindir}/osgsimulation}
 
-# %{?_with_demeter:%{_bindir}/osgdemeter}
+%{?_with_demeter:%{_bindir}/osgdemeter}
 
 %{_bindir}/osgGLUTsimple
 %{_bindir}/osgGLUTkeyboardmouse
@@ -270,7 +278,11 @@
 License:	LGPL
 
 %description -n OpenThreads
-OpenThreads
+OpenThreads is intended to provide a minimal & complete Object-Oriented (OO)
+thread interface for C++ programmers.  It is loosely modeled on the Java
+thread API, and the POSIX Threads standards.  The architecture of the 
+library is designed around "swappable" thread models which are defined at 
+compile-time in a shared object library.
 
 %post -n OpenThreads -p /sbin/ldconfig
 
@@ -283,13 +295,13 @@
 
 # OpenThreads-devel
 %package -n OpenThreads-devel
-Summary: 	OpenThreads-devel
+Summary: 	Devel files for OpenThreads
 Group:		Applications/Multimedia
 License:	LGPL
 Requires:	OpenThreads = %{version}-%{release}
 
 %description -n OpenThreads-devel
-Devel files for OpenThreads
+Development files for OpenThreads.
 
 %files -n OpenThreads-devel
 %defattr(-,root,root,-)
@@ -307,7 +319,11 @@
 Provides:	OpenProducer = %{version}-%{release}
 
 %description -n Producer
-Producer
+Open Producer (or simply Producer) is a cross-platform, C++ library for 
+managing OpenGL rendering contexts in a windowing system independent manner.
+Producer provides a simple, yet powerfully scalable approach for real-time 3D
+applications wishing to run within a single window to large, multidisplay 
+systems.
 
 %post -n Producer -p /sbin/ldconfig
 
@@ -320,7 +336,7 @@
 
 # Producer-devel
 %package -n Producer-devel
-Summary: 	Producer-devel
+Summary: 	Devel files for Producer
 Group:		Applications/Multimedia
 License:	OSGPL
 Requires:	Producer = %{version}-%{release}
@@ -328,7 +344,7 @@
 Provides:	OpenProducer-devel = %{version}-%{release}
 
 %description -n Producer-devel
-Devel files for Producer
+Development files for Producer.
 
 %files -n Producer-devel
 %defattr(-,root,root,-)
@@ -338,6 +354,12 @@
 %{_includedir}/Producer
 
 %changelog
+* Sat Aug 28 2005 Ralf Corsepius <rc040203 at freenet.de> - 0.9.9-3
+- Add full URL to Debian patch.
+- Add _with_demeter.
+- Extend Producer %%description.
+- Extend OpenThreads %%description.
+
 * Tue Aug 09 2005 Ralf Corsepius <ralf at links2linux.de> - 0.9.9-2
 - Fix license to OSGPL.
 - Change permissions on pkgconfig files to 0644.