rpms/ode/devel .cvsignore, 1.7, 1.8 ode.spec, 1.13, 1.14 sources, 1.7, 1.8

[Hans de Goede]

Author: jwrdegoede

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

Modified Files:
	.cvsignore ode.spec sources 
Log Message:
* Mon Sep 15 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.10.1-1
- New upstream release 0.10.1 (bz 460033)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ode/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	12 Oct 2007 20:53:59 -0000	1.7
+++ .cvsignore	15 Sep 2008 21:16:49 -0000	1.8
@@ -1 +1 @@
-ode-src-0.9.zip
+ode-0.10.1.tar.bz2


Index: ode.spec
===================================================================
RCS file: /cvs/extras/rpms/ode/devel/ode.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ode.spec	3 Apr 2008 13:07:56 -0000	1.13
+++ ode.spec	15 Sep 2008 21:16:50 -0000	1.14
@@ -1,13 +1,15 @@
 Name:           ode
-Version:        0.9
-Release:        4%{?dist}
+Version:        0.10.1
+Release:        1%{?dist}
 Summary:        High performance library for simulating rigid body dynamics
 Group:          System Environment/Libraries
 License:        BSD or LGPLv2+
 URL:            http://www.ode.org
-Source0:        http://downloads.sourceforge.net/opende/ode-src-%{version}.zip
-Patch0:         ode-0.6-configure.patch
-Patch1:         ode-0.8-install.patch
+Source0:        http://downloads.sourceforge.net/opende/ode-%{version}.tar.bz2
+# This works around a bug in rpmbuild, where with localbuilds it will pass
+# the machine being build on as host param to configure instead of the machine
+# on which the code will run
+Patch0:         ode-0.10.0-no-pentium-on-i386.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libGL-devel libGLU-devel
 
@@ -32,29 +34,25 @@
 
 %prep
 %setup -q
-%patch0 -p1 -z .configure
-%patch1 -p1 -z .install
-# sigh stop autoxxx from rerunning because of our patches above.
-touch aclocal.m4
-touch configure
-touch Makefile.in
-touch include/ode/config.h.in
-touch ode/src/Makefile.in
+%patch0 -p1
+# to stop autoxxx from getting regenerated because of our configure patch
+touch -r CHANGELOG.txt configure.in
 # stop rpmlint from complaining about executable files in the debug package
-chmod -x ode/src/stepfast.cpp include/ode/collision_trimesh.h
+chmod -x ode/src/stepfast.cpp include/ode/collision_trimesh.h \
+  include/ode/odeconfig.h
 
 
 %build
-%configure --enable-shared --enable-soname
-# <sigh> ./configure doesn't properly pick up our CFLAGS
-make %{?_smp_mflags} CFLAGS="%{optflags} -ffast-math" \
-  CXXFLAGS="%{optflags} -ffast-math"
+CFLAGS="%{optflags} -ffast-math"
+CXXFLAGS="%{optflags} -ffast-math"
+%configure --enable-shared --disable-static
+make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-rm $RPM_BUILD_ROOT%{_libdir}/libode.a
+rm $RPM_BUILD_ROOT%{_libdir}/libode.la
 
 
 %clean
@@ -69,7 +67,7 @@
 %files
 %defattr(-,root,root,-)
 %doc CHANGELOG.txt LICENSE*.TXT README.txt
-%{_libdir}/libode.so.*
+%{_libdir}/libode.so.1*
 
 %files devel
 %defattr(-,root,root,-)
@@ -79,6 +77,9 @@
 
 
 %changelog
+* Mon Sep 15 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.10.1-1
+- New upstream release 0.10.1 (bz 460033)
+
 * Thu Apr  3 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.9-4
 - Force proper use of RPM_OPT_FLAGS during build
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ode/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	12 Oct 2007 20:53:59 -0000	1.7
+++ sources	15 Sep 2008 21:16:50 -0000	1.8
@@ -1 +1 @@
-4c03759b76a0649a6d5108c8e172e1e4  ode-src-0.9.zip
+91c396b915539a760617437d56eb1681  ode-0.10.1.tar.bz2