rpms/wfmath/devel wfmath-0.3.4-64bit.patch, NONE, 1.1 wfmath.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

[Michael Thomas (wart)]

Author: wart

Update of /cvs/extras/rpms/wfmath/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6502/devel

Modified Files:
	.cvsignore sources 
Added Files:
	wfmath-0.3.4-64bit.patch wfmath.spec 
Log Message:
auto-import wfmath-0.3.4-2 on branch devel from wfmath-0.3.4-2.src.rpm

wfmath-0.3.4-64bit.patch:

--- NEW FILE wfmath-0.3.4-64bit.patch ---
diff -Naur wfmath-0.3.4.bak/wfmath/intstring_test.cpp wfmath-0.3.4/wfmath/intstring_test.cpp
--- wfmath-0.3.4.bak/wfmath/intstring_test.cpp	2003-08-08 14:25:30.000000000 -0700
+++ wfmath-0.3.4/wfmath/intstring_test.cpp	2006-07-19 09:52:40.000000000 -0700
@@ -34,12 +34,12 @@
 static void TestConvert()
 {
   for(unsigned i = 0; i < 100; ++i) {
-    unsigned long val = MTRand::instance.randInt();
+    unsigned int val = MTRand::instance.randInt();
     assert(strtoul(IntToString(val).c_str(), 0, 0) == val);
     // This assignment changes the value, but we just want a
     // random number, so we don't care. Large unsigned ints will
     // provide us negative numbers for testing.
-    long val2 = (long) val;
+    int val2 = (int) val;
     assert(atoi(IntToString(val2).c_str()) == val2);
   }
 }
diff -Naur wfmath-0.3.4.bak/wfmath/MersenneTwister.h wfmath-0.3.4/wfmath/MersenneTwister.h
--- wfmath-0.3.4.bak/wfmath/MersenneTwister.h	2004-01-31 08:10:15.000000000 -0800
+++ wfmath-0.3.4/wfmath/MersenneTwister.h	2006-07-19 09:40:40.000000000 -0700
@@ -74,7 +74,7 @@
 class MTRand {
 // Data
 public:
-	typedef unsigned long uint32;  // unsigned integer type, at least 32 bits
+	typedef unsigned int uint32;  // unsigned integer type, at least 32 bits
 	
 	enum { N = 624 };       // length of state vector
 	enum { SAVE = N + 1 };  // length of array for save()


--- NEW FILE wfmath.spec ---
Name:           wfmath
Version:        0.3.4
Release:        2%{?dist}
Summary:        WorldForge client math libraries

Group:          Development/Libraries
License:        GPL
URL:            http://worldforge.org/dev/eng/libraries/wfmath
Source0:        http://dl.sourceforge.net/worldforge/%{name}-%{version}.tar.gz
Patch0:         wfmath-0.3.4-64bit.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  doxygen

%description
WFMath provides mathematical functions for WorldForge clients.  The primary
focus of WFMath is geometric objects. Thus, it includes several shapes (boxes,
balls, lines), in addition to the basic math objects that are used to build
these shapes (points, vectors, matricies). WFMath provides a means for other
system compenents to pass geometric information around in a common format.


%package        devel
Summary:        Development files for wfmath
Group:          Development/Libraries
Requires:       pkgconfig %{name} = %{version}-%{release}


%description    devel
Libraries and header files for developing applications that use wfmath.


%prep
%setup -q
%patch0 -p1


%build
%configure --disable-static
make %{?_smp_mflags}

(cd doc && make doc)
# Rename a messed-up man page
mv doc/man/man3/WFMath_Polygon_* doc/man/man3/WFMath_Polygon_2.3
# Delete a messed-up man page that sometimes appears
rm -f doc/man/man3/*_.3


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

mkdir -p $RPM_BUILD_ROOT%{_mandir}/man3/
install -p -m0644 doc/man/man3/*.3 $RPM_BUILD_ROOT%{_mandir}/man3/

rm -f $RPM_BUILD_ROOT%{_libdir}/*.la

%clean
rm -rf $RPM_BUILD_ROOT

%check
make check

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING README TODO ChangeLog
%{_libdir}/lib%{name}-0.3.so.*


%files devel
%defattr(-,root,root,-)
%doc doc/CLASS_LAYOUT doc/html/
%{_includedir}/%{name}-0.3
%{_libdir}/lib%{name}-0.3.so
%{_libdir}/pkgconfig/*.pc
%{_mandir}/man3/*.gz


%changelog
* Wed Jul 19 2006 Wart <wart at kobold.org> 0.3.4-2
- Added patch to fix test failures on x86_64
- Add 'make check'
- Add missing Requires: pkgconfig to -devel subpackage

* Wed Jun 14 2006 Wart <wart at kobold.org> 0.3.4-1
- Initial spec file for Fedora Extras


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wfmath/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	20 Jul 2006 15:49:26 -0000	1.1
+++ .cvsignore	20 Jul 2006 15:49:56 -0000	1.2
@@ -0,0 +1 @@
+wfmath-0.3.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wfmath/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	20 Jul 2006 15:49:26 -0000	1.1
+++ sources	20 Jul 2006 15:49:56 -0000	1.2
@@ -0,0 +1 @@
+6a14f7de9d467d7b72b37da5ca5f92c5  wfmath-0.3.4.tar.gz