rpms/OpenSceneGraph/F-8 OpenSceneGraph.spec,1.29,1.30

[Ralf Corsépius (corsepiu)]

Author: corsepiu

Update of /cvs/pkgs/rpms/OpenSceneGraph/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27694

Modified Files:
	OpenSceneGraph.spec 
Log Message:
* Thu Nov 02 2007 Ralf Corsépius <rc040203 at freenet.de> - 2.0-9
- Add qt.
- Sync the spec with devel/.



Index: OpenSceneGraph.spec
===================================================================
RCS file: /cvs/pkgs/rpms/OpenSceneGraph/F-8/OpenSceneGraph.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- OpenSceneGraph.spec	20 Oct 2007 02:19:46 -0000	1.29
+++ OpenSceneGraph.spec	2 Nov 2007 15:33:48 -0000	1.30
@@ -15,13 +15,17 @@
 
 Name:           OpenSceneGraph
 Version:        %{srcvers}
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        High performance real-time graphics toolkit
 
 Group:          Applications/Multimedia
 License:        OSGPL
 URL:            http://www.openscenegraph.org/
+%if "%{version}" >= "2.2.0"
+Source0:        http://www.openscenegraph.org/downloads/developer_releases/OpenSceneGraph-%{srcvers}.zip
+%else
 Source0:        http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-%{srcvers}.zip
+%endif
 
 Patch0:         OpenSceneGraph-%{srcvers}.diff
 
@@ -40,6 +44,13 @@
 BuildRequires:  doxygen graphviz
 BuildRequires:  cmake
 BuildRequires:  wxGTK-devel
+BuildRequires:	qt-devel
+
+%if "%{version}" >= "2.2.0"
+%define OSGSRCDIR	OpenSceneGraph-%{version}
+%else
+%define OSGSRCDIR	OpenSceneGraph
+%endif
 
 %if "%{name}" == "OpenSceneGraph"
 Provides:       OpenSceneGraph2 = %{version}-%{release}
@@ -63,11 +74,11 @@
 pushd BUILD
 
 # FIXME: Should add -DBUILD_DOCUMENTATION=ON to build the docs, but it's broken
-%cmake -DBUILD_OSG_EXAMPLES=ON -DBUILD_OSG_WRAPPERS=ON ../OpenSceneGraph
+%cmake -DBUILD_OSG_EXAMPLES=ON -DBUILD_OSG_WRAPPERS=ON ../%{OSGSRCDIR}
 make VERBOSE=1 %{?_smp_mflags}
 
 # FIXME: Manually invoke doxygen, because doc-building is broken in OSG's cmake stuff
-OSGHOME=../OpenSceneGraph doxygen ../OpenSceneGraph/doc/Doxyfiles/core_Doxyfile
+OSGHOME=../%{OSGSRCDIR} doxygen ../%{OSGSRCDIR}/doc/Doxyfiles/core_Doxyfile
 popd
 
 # HACK: Upstream stuff lacks cmake support and is broken
@@ -75,12 +86,14 @@
   -e 's,^libdir=.*$,libdir=%{_libdir},' \
   -e 's,^includedir=.*$,includedir=%{_includedir},' \
   -e '/^Conflicts.*$/d' \
-  OpenSceneGraph/packaging/pkgconfig/openscenegraph.pc \
-  OpenSceneGraph/packaging/pkgconfig/openthreads.pc
+  %{OSGSRCDIR}/packaging/pkgconfig/openscenegraph.pc \
+  %{OSGSRCDIR}/packaging/pkgconfig/openthreads.pc
+%if "%{version}" < "2.2.0"
 sed -i -e 's,Version:.*,Version: 2.0.0,' \
-  OpenSceneGraph/packaging/pkgconfig/openscenegraph.pc
+  %{OSGSRCDIR}/packaging/pkgconfig/openscenegraph.pc
 sed -i -e 's,Version:.*,Version: 1.9.5,' \
-  OpenSceneGraph/packaging/pkgconfig/openthreads.pc
+  %{OSGSRCDIR}/packaging/pkgconfig/openthreads.pc
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -92,9 +105,9 @@
 popd
 
 # Abandoned w/ 2.0 by upstream, re-added to 2.1.*
-install -m 644 -D OpenSceneGraph/packaging/pkgconfig/openthreads.pc \
+install -m 644 -D %{OSGSRCDIR}/packaging/pkgconfig/openthreads.pc \
   ${RPM_BUILD_ROOT}%{_libdir}/pkgconfig/openthreads.pc
-install -m 644 -D OpenSceneGraph/packaging/pkgconfig/openscenegraph.pc \
+install -m 644 -D %{OSGSRCDIR}/packaging/pkgconfig/openscenegraph.pc \
   ${RPM_BUILD_ROOT}%{_libdir}/pkgconfig/openscenegraph.pc
 
 
@@ -105,7 +118,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc OpenSceneGraph/*.txt
+%doc %{OSGSRCDIR}/*.txt
 %{_bindir}/osgarchive
 %{_bindir}/osgconv
 %{_bindir}/osgversion
@@ -133,7 +146,7 @@
 
 %files libs
 %defattr(-,root,root,-)
-%{_libdir}/osgPlugins-2.0.*
+%{_libdir}/osgPlugins-%{srcvers}
 %{_libdir}/libosg*.so.*
 
 %package devel
@@ -175,6 +188,10 @@
 
 %files examples
 %defattr(-,root,root,-)
+%if "%{version}" >= "2.2.0"
+%{_bindir}/osgdepthpeeling
+%endif
+%{_bindir}/osgviewerQT
 %{_bindir}/osganimate
 %{_bindir}/osgautotransform
 %{_bindir}/osgbillboard
@@ -192,7 +209,9 @@
 %{_bindir}/osgcubemap
 %{_bindir}/osgdelaunay
 %{_bindir}/osgdepthpartition
+%if "%{version}" < "2.2.0"
 %{_bindir}/osgdepthshadow
+%endif
 %{_bindir}/osgdistortion
 %{_bindir}/osgfadetext
 %{_bindir}/osgforest
@@ -234,7 +253,9 @@
 %{_bindir}/osgshaders
 %{_bindir}/osgshaderterrain
 %{_bindir}/osgshadow
+%if "%{version}" < "2.2.0"
 %{_bindir}/osgshadowtexture
+%endif
 %{_bindir}/osgshape
 %{_bindir}/osgsimplifier
 %{_bindir}/osgslice
@@ -282,7 +303,7 @@
 
 %files -n OpenThreads
 %defattr(-,root,root,-)
-%doc OpenSceneGraph/*.txt
+%doc %{OSGSRCDIR}/*.txt
 %{_libdir}/libOpenThreads.so.*
 
 # OpenThreads-devel
@@ -303,6 +324,10 @@
 %{_includedir}/OpenThreads
 
 %changelog
+* Thu Nov 02 2007 Ralf Corsépius <rc040203 at freenet.de> - 2.0-9
+- Add qt.
+- Sync the spec with devel/.
+
 * Sat Oct 20 2007 Ralf Corsépius <rc040203 at freenet.de> - 2.0-8
 - Reflect Source0-URL having changed.