rpms/OpenSceneGraph/devel OpenSceneGraph.spec,1.2,1.3

[Ralf Corsépius (corsepiu)]

Author: corsepiu

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

Modified Files:
	OpenSceneGraph.spec 
Log Message:
- Move configuration to %%build.
- Spec file cosmetics.




Index: OpenSceneGraph.spec
===================================================================
RCS file: /cvs/extras/rpms/OpenSceneGraph/devel/OpenSceneGraph.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- OpenSceneGraph.spec	28 Aug 2005 04:54:23 -0000	1.2
+++ OpenSceneGraph.spec	28 Aug 2005 04:59:42 -0000	1.3
@@ -1,7 +1,7 @@
 Name:           OpenSceneGraph
 Version:        0.9.9
-Release:        3%{?dist}
-Summary:        High performance real-time graphics graphics toolkit
+Release:        4%{?dist}
+Summary:        High performance real-time graphics toolkit
 
 Group:          Applications/Multimedia
 License:        OSGPL
@@ -52,16 +52,7 @@
 cp OpenSceneGraph/Make/dependencies \
   OpenSceneGraph/Make/dependencies.bak
 
-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
-
+# Propagate RPM_OPT_FLAGS
 for file in OpenSceneGraph/src/osgWrappers/*/GNUmakefile; do
   sed -i -e '/^OPTF.*$/d' $file
 done
@@ -96,6 +87,17 @@
 export LD_LIBRARY_PATH="$PWD/Producer/lib/Linux32:$PWD/OpenThreads/lib/Linux32"
 %endif
 
+# configure
+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 dir in OpenThreads Producer OpenSceneGraph; do
   make -C $dir \
     COMPILE_OSG_OP_OT_WITH_SONAMES=YES \
@@ -354,7 +356,11 @@
 %{_includedir}/Producer
 
 %changelog
-* Sat Aug 28 2005 Ralf Corsepius <rc040203 at freenet.de> - 0.9.9-3
+* Sun Aug 28 2005 Ralf Corsepius <rc040203 at freenet.de> - 0.9.9-4
+- Move configuration to %%build.
+- Spec file cosmetics.
+
+* Sat Aug 27 2005 Ralf Corsepius <rc040203 at freenet.de> - 0.9.9-3
 - Add full URL to Debian patch.
 - Add _with_demeter.
 - Extend Producer %%description.