rpms/osgcal/FC-5 osgcal-0.1.44-64bit.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 osgcal.spec, 1.3, 1.4 sources, 1.2, 1.3

[Christopher Stone (xulchris)]

Author: xulchris

Update of /cvs/extras/rpms/osgcal/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1067/FC-5

Modified Files:
	.cvsignore osgcal.spec sources 
Added Files:
	osgcal-0.1.44-64bit.patch 
Log Message:
upstream sync

osgcal-0.1.44-64bit.patch:

--- NEW FILE osgcal-0.1.44-64bit.patch ---
--- osgcal.cpp~	2006-12-06 10:18:45.000000000 -0800
+++ osgcal.cpp	2006-12-06 10:18:54.000000000 -0800
@@ -286,7 +286,7 @@
 {
   char* endptr;
   errno = 0;
-  int val = (int)strtol(number,&endptr,10);
+  long val = strtol(number,&endptr,10);
   if ((errno == ERANGE && (val == LONG_MAX || val == LONG_MIN))
       || (errno != 0 && val == 0)) {
     return false;


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/osgcal/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	19 Jun 2006 08:21:10 -0000	1.2
+++ .cvsignore	6 Dec 2006 18:42:41 -0000	1.3
@@ -1 +1 @@
-osgcal-0.1.40.tar.gz
+osgcal-0.1.44.tar.gz


Index: osgcal.spec
===================================================================
RCS file: /cvs/extras/rpms/osgcal/FC-5/osgcal.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- osgcal.spec	8 Jul 2006 22:06:21 -0000	1.3
+++ osgcal.spec	6 Dec 2006 18:42:41 -0000	1.4
@@ -1,25 +1,23 @@
 Name:           osgcal
-Version:	0.1.40
-Release:        3%{?dist}
+Version:        0.1.44
+Release:        1%{?dist}
 Summary:        Adapts OpenSceneGraph to use Cal3D
+
 Group:          Development/Libraries
-License:        LGPL
+License:        GPL
 URL:            http://gna.org/projects/underware
 Source0:        http://download.gna.org/underware/sources/%{name}-%{version}.tar.gz
+Patch0:         %{name}-%{version}-64bit.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
 BuildRequires:  OpenSceneGraph-devel cal3d-devel libxml2-devel glib2-devel
-BuildRequires:  libungif-devel libtool
+BuildRequires:  libungif-devel libGL-devel SDL-devel xorg-x11-server-Xvfb
+BuildRequires:  xorg-x11-server-Xorg
 
-%if "%fedora" > "4"
-BuildRequires:  libGL-devel
-%else
-BuildRequires:	xorg-x11-devel
-%endif
 
 %description
 osgCal is an adapter to use the Cal3D character animation library
-(http://cal3d.sourceforge.net) inside the OpenSceneGraph OpenGL based
-3D scene graph (http://www.openscenegraph.org).
+inside the OpenSceneGraph OpenGL based 3D scene graph.
 
 %package devel
 Summary:        Library development files for osgCal
@@ -28,29 +26,43 @@
 Requires:       cal3d-devel
 
 %description devel
-This package contains headers and libraries required to build applications that
-use osgCal.
+This package contains headers and libraries required to build
+applications that use osgCal.
+
 
 %prep
 %setup -q
+%patch0 -p0 -b .64bit~
+
+# Avoid lib64 rpaths
+sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure
+
+# Fix rpmlint warnings
+chmod -x include/osgCal/HardwareModel
+
 
 %build
-LIBTOOL=libtool %configure --enable-gifplugin --disable-static
-%{__make} LIBTOOL=libtool %{?_smp_mflags}
+%configure --enable-gifplugin --disable-static
+make %{?_smp_mflags}
+
 
 %install
-%{__rm} -rf %{buildroot}
-%{__make} install DESTDIR=%{buildroot}
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
+
 
 %check
-%{__make} %{?_smp_mflags} check
+MALLOC_CHECK_=1 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 LGPL README
@@ -61,14 +73,36 @@
 
 %files devel
 %defattr(-,root,root,-)
+%doc COPYING
 %{_includedir}/osgCal
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/%{name}.pc
 %exclude %{_libdir}/*.la
-# libtool hack does not remove static libs
-%exclude %{_libdir}/*.a
+
 
 %changelog
+* Wed Dec 06 2006 Christopher Stone <chris.stone at gmail.com> 0.1.44-1
+- Upstream sync
+- Clean up description
+- Use new method to fix rpaths
+- Change license to GPL
+- Add 64bit patch
+- set MALLOC_CHECK_ to 1 to not exit on Xvfb double-free error
+
+* Sun Oct 15 2006 Christopher Stone <chris.stone at gmail.com> 0.1.43-1
+- Upstream sync
+
+* Sat Oct 14 2006 Christopher Stone <chris.stone at gmail.com> 0.1.42-1
+- Upstream sync
+
+* Sun Sep 03 2006 Christopher Stone <chris.stone at gmail.com> 0.1.41-1
+- Upstream sync
+- Remove FC4 support
+- Add new Build Requires for %%check
+
+* Thu Aug 31 2006 Christopher Stone <chris.stone at gmail.com> 0.1.40-4
+- FC6 Rebuild
+
 * Sat Jul 08 2006 Christopher Stone <chris.stone at gmail.com> 0.1.40-3
 - Rebuild against new cal3d
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/osgcal/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	19 Jun 2006 08:21:10 -0000	1.2
+++ sources	6 Dec 2006 18:42:41 -0000	1.3
@@ -1 +1 @@
-4e05fc0ea3320f502d2565a9ac7d2dbb  osgcal-0.1.40.tar.gz
+c6f43aa6014fc7fdc7cc0ab9e4b5a885  osgcal-0.1.44.tar.gz