rpms/cel/devel cel-1.2-gcc44.patch,NONE,1.1 cel.spec,1.5,1.6

[Hans de Goede]

Author: jwrdegoede

Update of /cvs/extras/rpms/cel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18103

Modified Files:
	cel.spec 
Added Files:
	cel-1.2-gcc44.patch 
Log Message:
* Mon Feb 23 2009 Hans de Goede <hdegoede at redhat.com> 1.2-6
- Fix building with gcc-4.4


cel-1.2-gcc44.patch:

--- NEW FILE cel-1.2-gcc44.patch ---
diff -up cel-src-1.2/plugins/behaviourlayer/python/blpython.cpp~ cel-src-1.2/plugins/behaviourlayer/python/blpython.cpp
--- cel-src-1.2/plugins/behaviourlayer/python/blpython.cpp~	2007-10-03 13:38:26.000000000 +0200
+++ cel-src-1.2/plugins/behaviourlayer/python/blpython.cpp	2009-02-23 14:49:03.000000000 +0100
@@ -161,7 +161,7 @@ iCelBehaviour* celBlPython::CreateBehavi
   PyObject *py_entity, *py_object;
 
   csString realname;
-  char* slash = strrchr (name, '/');
+  const char* slash = strrchr (name, '/');
   if (slash)
   {
     csString path;


Index: cel.spec
===================================================================
RCS file: /cvs/extras/rpms/cel/devel/cel.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- cel.spec	4 Dec 2008 17:48:01 -0000	1.5
+++ cel.spec	23 Feb 2009 14:26:41 -0000	1.6
@@ -1,12 +1,13 @@
 Name:           cel
 Version:        1.2
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Crystal Entity Layer
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://www.crystalspace3d.org/main/CEL
 Source0:        http://www.crystalspace3d.org/downloads/release/%{name}-src-%{version}.tar.bz2
 Patch0:         cel-src-1.2-bogus-shbang.patch
+Patch1:         cel-1.2-gcc44.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  jam crystalspace-devel >= 1.2 python-devel
 # crystalspace is ExcludeArch: ppc ppc64 for now (due to triggering a gcc bug)
@@ -49,6 +50,7 @@
 %prep
 %setup -q -n %{name}-src-%{version}
 %patch0 -p1
+%patch1 -p1
 # no custom CFLAGS please
 sed -i 's/COMPILER.CFLAGS.optimize += -O3 ;//' Jamrules
 # some general cleanups (make rpmlint happy)
@@ -118,6 +120,9 @@
 
 
 %changelog
+* Mon Feb 23 2009 Hans de Goede <hdegoede at redhat.com> 1.2-6
+- Fix building with gcc-4.4
+
 * Thu Dec 04 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 1.2-5
 - Rebuild for Python 2.6