rpms/osgcal/devel osgcal-0.1.46-gcc43.patch, 1.1, 1.2 osgcal.spec, 1.16, 1.17

[Ralf Corsépius]

Author: corsepiu

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

Modified Files:
	osgcal-0.1.46-gcc43.patch osgcal.spec 
Log Message:
* Sun Feb 15 2009 Ralf Corsépius <corsepiu at fedoraproject.org> - 0.1.46-8
- Rebuild against OSG-2.8.0.
- Revamp osgcal-0.1.46-gcc43.patch.


osgcal-0.1.46-gcc43.patch:

Index: osgcal-0.1.46-gcc43.patch
===================================================================
RCS file: /cvs/pkgs/rpms/osgcal/devel/osgcal-0.1.46-gcc43.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- osgcal-0.1.46-gcc43.patch	22 Feb 2008 04:25:02 -0000	1.1
+++ osgcal-0.1.46-gcc43.patch	15 Feb 2009 06:53:23 -0000	1.2
@@ -1,21 +1,47 @@
---- src/osgCal/HardwareModel.cpp~	2008-02-21 20:02:49.000000000 -0800
-+++ src/osgCal/HardwareModel.cpp	2008-02-21 20:03:06.000000000 -0800
+diff -Naur osgcal-0.1.46.orig/src/osgCal/HardwareModel.cpp osgcal-0.1.46/src/osgCal/HardwareModel.cpp
+--- osgcal-0.1.46.orig/src/osgCal/HardwareModel.cpp	2007-09-11 17:29:43.000000000 +0200
++++ osgcal-0.1.46/src/osgCal/HardwareModel.cpp	2009-02-15 07:27:24.000000000 +0100
 @@ -12,7 +12,7 @@
  #include "config.h"
  #endif
  
 -
-+#include <string.h>
++#include <cstring>
  #include "osgCal/HardwareModel"
  #include "osgCal/CustomAssert"
  
---- src/osgCal/SubMeshSoftware.cpp~	2008-02-21 20:13:14.000000000 -0800
-+++ src/osgCal/SubMeshSoftware.cpp	2008-02-21 20:13:51.000000000 -0800
+diff -Naur osgcal-0.1.46.orig/src/osgCal/IOCFG.cpp osgcal-0.1.46/src/osgCal/IOCFG.cpp
+--- osgcal-0.1.46.orig/src/osgCal/IOCFG.cpp	2007-09-11 17:29:43.000000000 +0200
++++ osgcal-0.1.46/src/osgCal/IOCFG.cpp	2009-02-15 07:27:24.000000000 +0100
+@@ -44,6 +44,8 @@
+ #include <osgDB/FileUtils>
+ #include <osgDB/FileNameUtils>
+ 
++#include <cstring>
++
+ #define LINE_BUFFER_SIZE 4096
+ 
+ bool readObject(const std::string& fileName, osgCal::CoreModel& coreModel) {
+diff -Naur osgcal-0.1.46.orig/src/osgCal/IOXFG.cpp osgcal-0.1.46/src/osgCal/IOXFG.cpp
+--- osgcal-0.1.46.orig/src/osgCal/IOXFG.cpp	2007-09-11 17:29:43.000000000 +0200
++++ osgcal-0.1.46/src/osgCal/IOXFG.cpp	2009-02-15 07:27:24.000000000 +0100
+@@ -120,6 +120,8 @@
+ #include <osgCal/SubMeshSoftware>
+ #include "osgCal/CoreModel"
+ 
++#include <cstring>
++
+ static bool writeObjectXFG(const std::string& fileName, const osgCal::CoreModel& coreModel) 
+ {
+   return true;
+diff -Naur osgcal-0.1.46.orig/src/osgCal/SubMeshSoftware.cpp osgcal-0.1.46/src/osgCal/SubMeshSoftware.cpp
+--- osgcal-0.1.46.orig/src/osgCal/SubMeshSoftware.cpp	2007-09-11 17:29:43.000000000 +0200
++++ osgcal-0.1.46/src/osgCal/SubMeshSoftware.cpp	2009-02-15 07:27:24.000000000 +0100
 @@ -48,6 +48,7 @@
  #include <osgCal/SubMeshSoftware>
  
  #include <iostream>
-+#include <string.h>
++#include <cstring>
  
  using namespace osgCal;
  


Index: osgcal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/osgcal/devel/osgcal.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- osgcal.spec	14 Aug 2008 11:47:31 -0000	1.16
+++ osgcal.spec	15 Feb 2009 06:53:23 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           osgcal
 Version:        0.1.46
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Adapts OpenSceneGraph to use Cal3D
 
 Group:          Development/Libraries
@@ -32,7 +32,7 @@
 
 %prep
 %setup -q
-%patch0 -p0 -b .gcc43~
+%patch0 -p1 -b .gcc43~
 
 # Avoid lib64 rpaths
 sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure
@@ -44,7 +44,7 @@
 
 %build
 %configure --enable-gifplugin --disable-static
-CFLAGS="$RPM_OPT_FLAGS" make %{?_smp_mflags}
+make %{?_smp_mflags}
 
 
 %install
@@ -84,6 +84,10 @@
 
 
 %changelog
+* Sun Feb 15 2009 Ralf Corsépius <corsepiu at fedoraproject.org> - 0.1.46-8
+- Rebuild against OSG-2.8.0.
+- Revamp osgcal-0.1.46-gcc43.patch.
+
 * Wed Aug 14 2008 Ralf Corsépius <rc040203 at freenet.de> - 0.1.46-7
 - Rebuild against OSG-2.6.0.