rpms/ode/EL-5 ode-0.10.0-no-pentium-on-i386.patch, NONE, 1.1 ode-0.11.1-multilib.patch, NONE, 1.1 ode.spec, 1.5, 1.6 sources, 1.3, 1.4 ode-0.6-configure.patch, 1.2, NONE ode-0.6-lib64.patch, 1.2, NONE

Fri Apr 9 08:49:48 UTC 2010

Author: s4504kr

Update of /cvs/pkgs/rpms/ode/EL-5
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv32126

Modified Files:
	ode.spec sources 
Added Files:
	ode-0.10.0-no-pentium-on-i386.patch ode-0.11.1-multilib.patch 
Removed Files:
	ode-0.6-configure.patch ode-0.6-lib64.patch 
Log Message:
Initial package for EPEL-5

ode-0.10.0-no-pentium-on-i386.patch:
 configure    |    2 +-
 configure.in |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE ode-0.10.0-no-pentium-on-i386.patch ---
diff -up ode-0.10.0/configure.in~ ode-0.10.0/configure.in
--- ode-0.10.0/configure.in~	2008-07-02 11:41:50.000000000 +0200
+++ ode-0.10.0/configure.in	2008-07-02 11:41:50.000000000 +0200
@@ -60,7 +60,7 @@ dnl this may NOT be the machine on which
 dnl so allow users to compile programs for their target machine.
 pentium=no
 cpu64=no
-case "$host_cpu" in
+case "$target_cpu" in
   i586 | i686 | i786 )
         pentium=yes
         AC_DEFINE(PENTIUM,1,[compiling for a pentium on a gcc-based platform?])
diff -up ode-0.10.0/configure~ ode-0.10.0/configure
--- ode-0.10.0/configure~	2008-07-02 11:41:48.000000000 +0200
+++ ode-0.10.0/configure	2008-07-02 11:41:48.000000000 +0200
@@ -20857,7 +20857,7 @@ echo "${ECHO_T}$enable_demos" >&6; }
 
 pentium=no
 cpu64=no
-case "$host_cpu" in
+case "$target_cpu" in
   i586 | i686 | i786 )
         pentium=yes
 

ode-0.11.1-multilib.patch:
 ode-config.in |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE ode-0.11.1-multilib.patch ---
diff -up ode-0.11.1/ode-config.in~ ode-0.11.1/ode-config.in
--- ode-0.11.1/ode-config.in~	2008-08-23 02:31:01.000000000 +0200
+++ ode-0.11.1/ode-config.in	2009-11-12 08:02:24.000000000 +0100
@@ -39,10 +39,10 @@ while test $# -gt 0; do
       echo @ODE_RELEASE@
       ;;
     --cflags)
-      echo  -I at includedir@ @ODE_PRECISION@
+      echo @ODE_PRECISION@
       ;;
     --libs)
-      echo  -L at libdir@ -lode
+      echo -lode
       ;;
     *)
       echo "${usage}" 1>&2


Index: ode.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ode/EL-5/ode.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- ode.spec	4 Oct 2006 22:29:26 -0000	1.5
+++ ode.spec	9 Apr 2010 08:49:48 -0000	1.6
@@ -1,13 +1,16 @@
 Name:           ode
-Version:        0.7
-Release:        2%{?dist}
+Version:        0.11.1
+Release:        4%{?dist}
 Summary:        High performance library for simulating rigid body dynamics
 Group:          System Environment/Libraries
-License:        BSD LGPL
+License:        BSD or LGPLv2+
 URL:            http://www.ode.org
-Source0:        http://dl.sourceforge.net/sourceforge/opende/ode-src-%{version}.zip
-Patch0:         ode-0.6-configure.patch
-Patch1:         ode-0.6-lib64.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
+Patch1:         ode-0.11.1-multilib.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libGL-devel libGLU-devel
 
@@ -23,7 +26,7 @@ many computer games, 3D authoring tools 
 %package        devel
 Summary:        Development files for %{name}
 Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name} = %{version}-%{release}, pkgconfig
 
 %description    devel
 The %{name}-devel package contains libraries and header files for
@@ -32,30 +35,26 @@ developing applications that use %{name}
 
 %prep
 %setup -q
-%patch0 -p1 -z .configure
-%patch1 -p1 -z .lib64
-# 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
+%patch1 -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 include/*/*.h ode/src/*.cpp
+chmod -x ode/src/stepfast.cpp include/ode/collision_trimesh.h \
+  include/ode/odeconfig.h
 
 
 %build
-export CFLAGS="%{optflags} -ffast-math -fPIC"
-export CXXFLAGS="%{optflags} -ffast-math -fPIC"
-%configure --enable-shared --enable-soname
-make %{?_smp_mflags}
+CFLAGS="%{optflags} -ffast-math"
+CXXFLAGS="%{optflags} -ffast-math"
+%configure --enable-shared --disable-static
+make %{?_smp_mflags} X_LIBS=-lX11
 
 
 %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.so.0.6
+rm $RPM_BUILD_ROOT%{_libdir}/libode.la
 
 
 %clean
@@ -70,16 +69,63 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc CHANGELOG.txt LICENSE*.TXT README.txt
-%{_libdir}/libode.so.*
+%{_libdir}/libode.so.1*
 
 %files devel
 %defattr(-,root,root,-)
 %{_bindir}/%{name}-config
 %{_includedir}/%{name}
 %{_libdir}/libode.so
+%{_libdir}/pkgconfig/%{name}.pc
 
 
 %changelog
+* Tue Feb 16 2010 Hans de Goede <hdegoede at redhat.com> 0.11.1-4
+- Fix FTBFS (#564642)
+
+* Thu Nov 12 2009 Hans de Goede <hdegoede at redhat.com> 0.11.1-3
+- Fix multilib conflict in -devel sub package (#507981)
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.11.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Mon May 25 2009 Hans de Goede <hdegoede at redhat.com> 0.11.1-1
+- New upstream release 0.11.1
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.11-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Fri Jan 30 2009 Hans de Goede <hdegoede at redhat.com> 0.11-1
+- New upstream release 0.11
+
+* 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
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.9-3
+- Autorebuild for GCC 4.3
+
+* Thu Oct 18 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.9-2
+- Drop workaround for stormbaancoureur crash, it is now fixed in
+  stormbaancoureur
+
+* Fri Oct 12 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.9-1
+- New upstream release 0.9 (final)
+
+* Fri Sep 28 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.9-0.1.rc1
+- New upstream release 0.9-rc1
+
+* Tue Sep 11 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.8.1-0.1.rc1
+- New upstream release 0.8.1-rc1
+
+* Wed Aug 15 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.8-2
+- Update License tag for new Licensing Guidelines compliance
+
+* Wed Feb 14 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.8-1
+- New upstream release 0.8
+
 * Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.7-2
  - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ode/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	22 Sep 2006 12:33:04 -0000	1.3
+++ sources	9 Apr 2010 08:49:48 -0000	1.4
@@ -1 +1 @@
-b6727fef2cbb9ca812438bb774c9d6ec  ode-src-0.7.zip
+c5d51e4c73bff379e5ae18ac218ebba3  ode-0.11.1.tar.bz2


--- ode-0.6-configure.patch DELETED ---


--- ode-0.6-lib64.patch DELETED ---

