[openCOLLADA] Rebuild for GCC 4.7.0. Change how library soversion is set and test for abi breakages. Fix overridin

[Richard Shaw]

commit a421b6f721808e8842754d69917a0645c8ff2eff
Author: Richard M. Shaw <hobbes1069 at gmail.com>
Date:   Mon Jan 9 19:45:42 2012 -0600

    Rebuild for GCC 4.7.0.
    Change how library soversion is set and test for abi breakages.
    Fix overriding of required build flags.

 openCOLLADA-gcc47.patch |   23 +++++++++++++++++++++++
 openCOLLADA.spec        |   30 +++++++++++++++++++-----------
 2 files changed, 42 insertions(+), 11 deletions(-)
---
diff --git a/openCOLLADA-gcc47.patch b/openCOLLADA-gcc47.patch
new file mode 100644
index 0000000..0bdbbe4
--- /dev/null
+++ b/openCOLLADA-gcc47.patch
@@ -0,0 +1,23 @@
+diff -Naur openCOLLADA-svn864.orig/COLLADAStreamWriter/include/COLLADASWAnnotation.h openCOLLADA-svn864/COLLADAStreamWriter/include/COLLADASWAnnotation.h
+--- openCOLLADA-svn864.orig/COLLADAStreamWriter/include/COLLADASWAnnotation.h	2010-11-03 07:03:30.000000000 -0500
++++ openCOLLADA-svn864/COLLADAStreamWriter/include/COLLADASWAnnotation.h	2012-01-06 13:19:26.360616290 -0600
+@@ -219,7 +219,7 @@
+         void add ( 
+             const String &name, 
+             const ValueType::ColladaType &type, 
+-            const T val ) const
++            const T val )
+         {
+             openAnnotation ( name );
+             openValuesElement ( type );
+diff -Naur openCOLLADA-svn864.orig/common/libBuffer/include/CommonBuffer.h openCOLLADA-svn864/common/libBuffer/include/CommonBuffer.h
+--- openCOLLADA-svn864.orig/common/libBuffer/include/CommonBuffer.h	2011-08-30 05:51:20.000000000 -0500
++++ openCOLLADA-svn864/common/libBuffer/include/CommonBuffer.h	2012-01-09 10:40:16.964170716 -0600
+@@ -11,6 +11,7 @@
+ #ifndef __COMMON_BUFFER_H__
+ #define __COMMON_BUFFER_H__
+ 
++#include <cstring>
+ #include "CommonIBufferFlusher.h"
+ 
+ namespace Common
diff --git a/openCOLLADA.spec b/openCOLLADA.spec
index 54e2aa9..d1ffe37 100644
--- a/openCOLLADA.spec
+++ b/openCOLLADA.spec
@@ -1,7 +1,6 @@
-# These are needed to fake the library version.
 %global AGE 864
 # Upstream does not maintain a soversion so we define one here.
-# abi-compliance-checker will be used to determin if an abi breakage occurs
+# abi-compliance-checker will be used to determine if an abi breakage occurs
 # and the soversion will be incremented.
 %global sover 0.1
 
@@ -23,6 +22,7 @@ Source1:        ChangeLog
 
 Patch0:         openCOLLADA-svn863-cmake.patch
 Patch1:         openCOLLADA-svn863-libs.patch
+Patch2:         openCOLLADA-gcc47.patch
 
 BuildRequires:  dos2unix
 BuildRequires:  fftw-devel
@@ -77,6 +77,7 @@ XML validator for COLLADA files, based on the COLLADASaxFrameworkLoader.
 %setup -q -n %{name}-svn%{AGE}
 %patch0 -p1 -b .cmake
 %patch1 -p1 -b .libs
+%patch2 -p1 -b .gcc47
 
 # Remove unused bundled libraries
 rm -rf Externals/{Cg,expat,lib3ds,LibXML,MayaDataModel,pcre,zlib,zziplib}
@@ -102,13 +103,18 @@ install -p -m 0644 %{S:1} ./
 
 
 %build
-# Build openCOLLADA shared libraries.
-mkdir -p Build
-pushd Build
-%cmake ../ -DUSE_STATIC=OFF -DUSE_SHARED=ON -Dsoversion=%{sover} -DCMAKE_SKIP_RPATH=ON
-# Note building with _smp_mflags does not work for some reason...
-make
-popd
+rm -rf Build && mkdir -p Build && pushd Build
+%cmake -DUSE_STATIC=OFF \
+       -DUSE_SHARED=ON \
+       -Dsoversion=%{sover} \
+       -DCMAKE_SKIP_RPATH=ON \
+       -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+       ../
+
+# Note building with _smp_mflags does not work
+make 
+
+#%{?_smp_mflags}
 
 
 %install
@@ -126,7 +132,7 @@ install -p -m 0755 bin/* %{buildroot}%{_bindir}/
 
 
 %files
-%doc README LICENSE README.COLLADAStreamWriter COLLADAStreamWriter/AUTHORS ChangeLog
+%doc README LICENSE README.COLLADAStreamWriter COLLADAStreamWriter/AUTHORS Changelog
 %{_libdir}/lib*.so.%{sover}
 
 %files doc
@@ -141,8 +147,10 @@ install -p -m 0755 bin/* %{buildroot}%{_bindir}/
 
 
 %changelog
-* Thu Jan 05 2012 Richard Shaw <hobbes1069 at gmail.com? - 0-10
+* Thu Jan 05 2012 Richard Shaw <hobbes1069 at gmail.com> - 0-10
 - Rebuild for GCC 4.7.0.
+- Change how library soversion is set and test for abi breakages.
+- Fix overriding of required build flags.
 
 * Wed Oct 26 2011 Richard Shaw <hobbes1069 at gmail.com> - 0-9
 - Update to svn revision 864.