rpms/OpenSceneGraph/devel OpenSceneGraph.spec,1.46,1.47

[corsepiu]

Author: corsepiu

Update of /cvs/pkgs/rpms/OpenSceneGraph/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27450

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



Index: OpenSceneGraph.spec
===================================================================
RCS file: /cvs/pkgs/rpms/OpenSceneGraph/devel/OpenSceneGraph.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- OpenSceneGraph.spec	18 Aug 2009 03:02:59 -0000	1.46
+++ OpenSceneGraph.spec	18 Aug 2009 05:24:52 -0000	1.47
@@ -9,7 +9,7 @@
 
 Name:           OpenSceneGraph
 Version:        %{apivers}
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        High performance real-time graphics toolkit
 
 Group:          Applications/Multimedia
@@ -44,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}
@@ -67,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
@@ -82,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
@@ -108,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
 
@@ -164,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
@@ -228,7 +192,6 @@ Sample applications for OpenSceneGraph
 
 %files examples
 %defattr(-,root,root,-)
-%if "%{version}" >= "2.8.0"
 %{_bindir}/osg2cpp
 %{_bindir}/osganimationmakepath
 %{_bindir}/osganimationnode
@@ -248,7 +211,6 @@ Sample applications for OpenSceneGraph
 %{_bindir}/osgsidebyside
 %{_bindir}/osgwidgetmessagebox
 %{_bindir}/osgwidgetperformance
-%endif
 %{_bindir}/osgfont
 %{_bindir}/osggeometryshaders
 %{_bindir}/osgimagesequence
@@ -392,14 +354,15 @@ 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.