rpms/cal3d/EL-5 cal3d-0.11.0-gcc43.patch, NONE, 1.1 cal3d.spec, 1.4, 1.5

[Christopher Stone (xulchris)]

Author: xulchris

Update of /cvs/extras/rpms/cal3d/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12969

Modified Files:
	cal3d.spec 
Added Files:
	cal3d-0.11.0-gcc43.patch 
Log Message:
update to latest

cal3d-0.11.0-gcc43.patch:

--- NEW FILE cal3d-0.11.0-gcc43.patch ---
--- src/cal3d/hardwaremodel.cpp~	2008-02-21 19:20:18.000000000 -0800
+++ src/cal3d/hardwaremodel.cpp	2008-02-21 19:20:33.000000000 -0800
@@ -12,7 +12,7 @@
 #include "config.h"
 #endif
 
-
+#include <string.h>
 #include "cal3d/error.h"
 #include "cal3d/hardwaremodel.h"
 #include "cal3d/coremodel.h"
--- src/cal3d/platform.cpp~	2008-02-21 19:20:26.000000000 -0800
+++ src/cal3d/platform.cpp	2008-02-21 19:20:40.000000000 -0800
@@ -16,6 +16,7 @@
 // Includes                                                                   //
 //****************************************************************************//
 
+#include <string.h>
 #include "cal3d/platform.h"
 
  /*****************************************************************************/
--- src/cal3d/renderer.cpp~	2008-02-21 19:30:35.000000000 -0800
+++ src/cal3d/renderer.cpp	2008-02-21 19:30:43.000000000 -0800
@@ -16,6 +16,7 @@
 // Includes                                                                   //
 //****************************************************************************//
 
+#include <string.h>
 #include "cal3d/error.h"
 #include "cal3d/renderer.h"
 #include "cal3d/coremodel.h"
--- src/cal3d/submesh.cpp~	2008-02-21 19:35:00.000000000 -0800
+++ src/cal3d/submesh.cpp	2008-02-21 19:35:10.000000000 -0800
@@ -12,6 +12,7 @@
 #include "config.h"
 #endif
 
+#include <string.h>
 #include "cal3d/submesh.h"
 #include "cal3d/error.h"
 #include "cal3d/coresubmesh.h"
--- src/cal3d_converter.cpp~	2008-02-21 19:40:07.000000000 -0800
+++ src/cal3d_converter.cpp	2008-02-21 19:40:22.000000000 -0800
@@ -9,6 +9,7 @@
 // your option) any later version.                                            //
 //****************************************************************************//
 
+#include <strings.h>
 #include "cal3d/cal3d.h"
 
 #define SKELETON 0


Index: cal3d.spec
===================================================================
RCS file: /cvs/extras/rpms/cal3d/EL-5/cal3d.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- cal3d.spec	31 Aug 2006 22:46:23 -0000	1.4
+++ cal3d.spec	25 May 2008 21:34:33 -0000	1.5
@@ -1,11 +1,14 @@
 Name:           cal3d
 Version:        0.11.0
-Release:        2%{?dist}
+Release:        6%{?dist}
 Summary:        Skeletal based 3-D character animation library
-License:        LGPL
+
+License:        LGPLv2+
 URL:            http://gna.org/projects/cal3d
-Source0:        http://download.gna.org/cal3d/sources/%{name}-%{version}.tar.gz
+Source0:        http://download.gna.org/%{name}/sources/%{name}-%{version}.tar.gz
+Patch0:         %{name}-0.11.0-gcc43.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
 BuildRequires:  doxygen libtool
 
 %if 0%{?suse_version}
@@ -38,34 +41,47 @@
 %description doc
 This package contains modeling documentation and a users guide for Cal3D.
 
+
 %prep
 %setup -q
+%patch0 -p0 -b .gcc43
+
 
 %build
 LIBTOOL=libtool %configure
-%{__make} LIBTOOL=libtool %{?_smp_mflags}
-( cd docs && %{__make} doc-guide && %{__make} doc-api )
+make LIBTOOL=libtool %{?_smp_mflags}
+( cd docs && make doc-guide && make doc-api )
+
 
 %install
-%{__rm} -rf %{buildroot}
-%{__make} install DESTDIR=%{buildroot}
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
+
+# remove libtool archives and static libraries
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
+
 
 %check
-%{__make} %{?_smp_mflags} check
+# https://gna.org/bugs/index.php?8416
+#make check
+
 
 %clean
-%{__rm} -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
+
 
 %post -p /sbin/ldconfig
+
 %postun -p /sbin/ldconfig
 
+
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README TODO
 %{_bindir}/cal3d_converter
 %{_mandir}/man1/cal3d_converter.1.gz
 %{_libdir}/*.so.*
-%exclude %{_libdir}/*.a
 
 %files devel
 %defattr(-,root,root,-)
@@ -73,14 +89,31 @@
 %{_includedir}/%{name}
 %{_libdir}/pkgconfig/%{name}.pc
 %{_libdir}/*.so
-%exclude %{_libdir}/*.la
 
 %files doc
 %defattr(-,root,root,-)
 %doc docs/guide
 # upstream forgot this for 0.11.0: docs/modeling
 
+
 %changelog
+* Thu Feb 21 2008 Christopher Stone <chris.stone at gmail.com> 0.11.0-6
+- Add gcc4.3 patch
+- Update %%license
+
+* Wed Feb 20 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.11.0-5
+- Autorebuild for GCC 4.3
+
+* Wed Jan 31 2007 Christopher Stone <chris.stone at gmail.com> 0.11.0-4
+- Fix stupid type-o
+
+* Wed Jan 31 2007 Christopher Stone <chris.stone at gmail.com> 0.11.0-3
+- Disable make check (https://gna.org/bugs/index.php?8416)
+- Remove system call macros
+- Use $RPM_BUILD_ROOT instead of %%{buildroot}
+- Some whitespace cleanup
+- Use rm instead of %%exclude on static libs and libtool archives
+
 * Thu Aug 31 2006 Christopher Stone <chris.stone at gmail.com> 0.11.0-2
 - FC6 Rebuild