[osgal] Rebuilt for OSG-3.2.0.

[corsepiu]

commit 52208100bab60a6e3c0571b3c29142129cabf991
Author: Ralf Corsépius <corsepiu at fedoraproject.org>
Date:   Wed Aug 14 17:29:57 2013 +0200

    Rebuilt for OSG-3.2.0.
    
    - Fixup %changelog dates.
    - Modernize spec.

 osgal-0.6.1-osg-3.2.0.diff |   46 ++++++++++++++++++++++++++++++++++++++++++++
 osgal.spec                 |   25 ++++++++++++++---------
 2 files changed, 61 insertions(+), 10 deletions(-)
---
diff --git a/osgal-0.6.1-osg-3.2.0.diff b/osgal-0.6.1-osg-3.2.0.diff
new file mode 100644
index 0000000..c374dc5
--- /dev/null
+++ b/osgal-0.6.1-osg-3.2.0.diff
@@ -0,0 +1,46 @@
+diff -Naur osgal-0.6.1.orig/examples/osgal/osgal.cpp osgal-0.6.1/examples/osgal/osgal.cpp
+--- osgal-0.6.1.orig/examples/osgal/osgal.cpp	2007-08-02 15:38:13.000000000 +0200
++++ osgal-0.6.1/examples/osgal/osgal.cpp	2013-08-14 07:18:34.429730017 +0200
+@@ -171,16 +171,16 @@
+ 	normals->push_back(osg::Vec3(0.0f,0.0f,1.0f));
+ 
+ 
+-	osg::Geometry* geom = new osg::Geometry;
++	deprecated_osg::Geometry* geom = new deprecated_osg::Geometry;
+ 	geom->setVertexArray(coords);
+ 	geom->setVertexIndices(coordIndices);
+ 
+ 	geom->setColorArray(colors);
+ 	geom->setColorIndices(colorIndices);
+-	geom->setColorBinding(osg::Geometry::BIND_PER_PRIMITIVE);
++	geom->setColorBinding(deprecated_osg::Geometry::BIND_PER_PRIMITIVE);
+ 
+ 	geom->setNormalArray(normals);
+-	geom->setNormalBinding(osg::Geometry::BIND_OVERALL);
++	geom->setNormalBinding(deprecated_osg::Geometry::BIND_OVERALL);
+ 
+ 	geom->addPrimitiveSet(new osg::DrawArrays(osg::PrimitiveSet::QUADS,0,coordIndices->size()));
+ 
+diff -Naur osgal-0.6.1.orig/examples/osgalmultiple/osgalmultiple.cpp osgal-0.6.1/examples/osgalmultiple/osgalmultiple.cpp
+--- osgal-0.6.1.orig/examples/osgalmultiple/osgalmultiple.cpp	2007-08-02 15:38:13.000000000 +0200
++++ osgal-0.6.1/examples/osgalmultiple/osgalmultiple.cpp	2013-08-14 07:45:50.575457764 +0200
+@@ -135,16 +135,16 @@
+     normals->push_back(osg::Vec3(0.0f,0.0f,1.0f));
+     
+ 
+-    osg::Geometry* geom = new osg::Geometry;
++    deprecated_osg::Geometry* geom = new deprecated_osg::Geometry;
+     geom->setVertexArray(coords);
+     geom->setVertexIndices(coordIndices);
+     
+     geom->setColorArray(colors);
+     geom->setColorIndices(colorIndices);
+-    geom->setColorBinding(osg::Geometry::BIND_PER_PRIMITIVE);
++    geom->setColorBinding(deprecated_osg::Geometry::BIND_PER_PRIMITIVE);
+     
+     geom->setNormalArray(normals);
+-    geom->setNormalBinding(osg::Geometry::BIND_OVERALL);
++    geom->setNormalBinding(deprecated_osg::Geometry::BIND_OVERALL);
+     
+     geom->addPrimitiveSet(new osg::DrawArrays(osg::PrimitiveSet::QUADS,0,coordIndices->size()));
+     
diff --git a/osgal.spec b/osgal.spec
index bbb1741..a88c882 100644
--- a/osgal.spec
+++ b/osgal.spec
@@ -1,14 +1,16 @@
 Name:           osgal
 Epoch:          1
 Version:        0.6.1
-Release:        18%{?dist}
+Release:        19%{?dist}
 Summary:        Adapts OpenSceneGraph to use OpenAL++
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://www.vrlab.umu.se/research/osgAL
 Source0:        http://downloads.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# osgal-0.6.1 uses contructs which have been deprecated in OSG-3.2.0
+# and are likely to be removed in OSG > 3.2.0
+Patch0:		osgal-0.6.1-osg-3.2.0.diff
 
 BuildRequires:  OpenSceneGraph-devel OpenThreads-devel
 BuildRequires:  openal-devel freealut-devel libvorbis-devel
@@ -34,6 +36,11 @@ that use osgAL.
 
 %prep
 %setup -q
+%if 0%{?fedora} > 19
+# For OSG >= 3.2.0, non-applicable with OSG < 3.2.0
+%patch0 -p1
+%endif
+
 sed -i -e 's/^\(CXXFLAGS="[^"]*\)/\1 $CXXFLAGS/' configure.in
 autoreconf --force --install
 
@@ -52,7 +59,6 @@ make %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # remove libtool archive
@@ -63,22 +69,16 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 make check
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
 
 %files
-%defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README
 %{_libdir}/*.so.*
 
 %files devel
-%defattr(-,root,root,-)
 %doc doc/*html
 %{_includedir}/osgAL
 %{_includedir}/openalpp
@@ -87,6 +87,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Aug 14 2013 Ralf Corsépius <corsepiu at fedoraproject.org> - 1:0.6.1-19
+- Rebuilt for OSG-3.2.0.
+- Fixup %%changelog dates.
+- Modernize spec.
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:0.6.1-18
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
@@ -129,7 +134,7 @@ rm -rf $RPM_BUILD_ROOT
 * Sun Feb 15 2009 Ralf Corsépius <corsepiu at fedoraproject.org> - 1:0.6.1-6
 - Rebuild against OSG-2.8.0.
 
-* Wed Aug 14 2008 Ralf Corsépius <rc040203 at freenet.de> - 1:0.6.1-5
+* Thu Aug 14 2008 Ralf Corsépius <rc040203 at freenet.de> - 1:0.6.1-5
 - Rebuild against OSG-2.6.0.
 
 * Fri May 16 2008 Ralf Corsépius <rc040203 at freenet.de> - 1:0.6.1-4