[ode] Fix URLs to point to new upstream (rhbz#1131050)
Hans de Goede
jwrdegoede at fedoraproject.org
Wed Oct 29 15:13:02 UTC 2014
commit b3a9312354e103e7a5d1b8e568fac4bf79812f8d
Author: Hans de Goede <hdegoede at redhat.com>
Date: Wed Oct 29 16:13:04 2014 +0100
Fix URLs to point to new upstream (rhbz#1131050)
- Update to 0.13.1 (rhbz#1131050)
.gitignore | 1 +
ode-0.10.0-no-pentium-on-i386.patch | 12 ------------
ode-0.11.1-multilib.patch | 12 ++++++------
ode-0.13.1-double-config.patch | 28 ++++++++++++++++++++++++++++
ode.spec | 34 +++++++++++++++++++++++-----------
sources | 2 +-
6 files changed, 59 insertions(+), 30 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 18fe911..2a7f634 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
ode-0.11.1.tar.bz2
/ode-0.12.tar.bz2
+/ode-0.13.1.tar.gz
diff --git a/ode-0.10.0-no-pentium-on-i386.patch b/ode-0.10.0-no-pentium-on-i386.patch
index 752d039..23952e5 100644
--- a/ode-0.10.0-no-pentium-on-i386.patch
+++ b/ode-0.10.0-no-pentium-on-i386.patch
@@ -1,15 +1,3 @@
-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
diff --git a/ode-0.11.1-multilib.patch b/ode-0.11.1-multilib.patch
index cc62bc7..792e243 100644
--- a/ode-0.11.1-multilib.patch
+++ b/ode-0.11.1-multilib.patch
@@ -1,12 +1,12 @@
-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
+diff -up ode-0.13.1/ode-config.in.orig ode-0.13.1/ode-config.in
+--- ode-0.13.1/ode-config.in.orig 2014-02-04 07:00:58.000000000 +0100
++++ ode-0.13.1/ode-config.in 2014-10-29 12:53:06.347970838 +0100
@@ -39,10 +39,10 @@ while test $# -gt 0; do
- echo @ODE_RELEASE@
+ echo @ODE_VERSION@
;;
--cflags)
-- echo -I at includedir@ @ODE_PRECISION@
-+ echo @ODE_PRECISION@
+- echo -I at includedir@
++ echo
;;
--libs)
- echo -L at libdir@ -lode
diff --git a/ode-0.13.1-double-config.patch b/ode-0.13.1-double-config.patch
new file mode 100644
index 0000000..45ab67d
--- /dev/null
+++ b/ode-0.13.1-double-config.patch
@@ -0,0 +1,28 @@
+diff -up ode-0.13.1/ode-double-config~ ode-0.13.1/ode-double-config
+--- ode-0.13.1/ode-double-config~ 2014-10-29 13:22:58.000000000 +0100
++++ ode-0.13.1/ode-double-config 2014-10-29 13:24:17.436154237 +0100
+@@ -39,10 +39,10 @@ while test $# -gt 0; do
+ echo 0.13.1
+ ;;
+ --cflags)
+- echo
++ echo -DdIDEDOUBLE
+ ;;
+ --libs)
+- echo -lode
++ echo -lode-double
+ ;;
+ *)
+ echo "${usage}" 1>&2
+diff -up ode-0.13.1/ode-double.pc~ ode-0.13.1/ode-double.pc
+--- ode-0.13.1/ode-double.pc~ 2014-10-29 13:22:58.000000000 +0100
++++ ode-0.13.1/ode-double.pc 2014-10-29 13:24:19.693095427 +0100
+@@ -7,6 +7,6 @@ precision=dDOUBLE
+ Name: ode
+ Description: Open Dynamics Engine
+ Version: 0.13.1
+-Libs: -L${libdir} -lode
++Libs: -L${libdir} -lode-double
+ Libs.private: -lstdc++ -lm
+-Cflags: -I${includedir}
++Cflags: -I${includedir} -DdIDEDOUBLE
diff --git a/ode.spec b/ode.spec
index 2359c06..7f7e9b8 100644
--- a/ode.spec
+++ b/ode.spec
@@ -1,18 +1,20 @@
-%global somajor 3
+%global somajor 4
Name: ode
-Version: 0.12
-Release: 6%{?dist}
+Version: 0.13.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-%{version}.tar.bz2
+URL: https://bitbucket.org/odedevs/ode
+Source0: https://bitbucket.org/odedevs/ode/downloads/ode-%{version}.tar.gz
# 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
+# Modify ode-double.pc and ode-double.config to set dDOUBLE, link right lib
+Patch2: ode-0.13.1-double-config.patch
BuildRequires: libGL-devel libGLU-devel
%description
@@ -50,20 +52,26 @@ developing applications that use %{name} or %{name}-double.
%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/ode/collision_trimesh.h \
- include/ode/odeconfig.h
# allow overriding EXTRA_LIBTOOL_LDFLAGS from the make cmdline
sed -i 's/libode_la_LDFLAGS = @EXTRA_LIBTOOL_LDFLAGS@/libode_la_LDFLAGS = $(EXTRA_LIBTOOL_LDFLAGS)/' \
ode/src/Makefile.in
+# mv some license files around to give them all a unique name
+mv OPCODE/COPYING OPCODE-COPYING
+for i in ou/LICENSE*.TXT; do
+ sed -i.bak 's/\r//' $i
+ touch -r $i.bak $i
+ mv $i `echo $i|sed 's|ou/LICENSE|OU-LICENSE|'`
+done
+mv libccd/BSD-LICENSE LIBCCD-LICENSE.TXT
%build
%configure --enable-shared --disable-static --enable-double-precision
make %{?_smp_mflags} X_LIBS=-lX11 EXTRA_LIBTOOL_LDFLAGS="-release double"
-sed -i 's|-lode|-lode-double|g' ode-config ode.pc
mv ode-config ode-double-config
mv ode.pc ode-double.pc
+# Adjust ode-double-config and ode-double.pc to set dDOUBLE, use proper lib
+patch -p1 < %{PATCH2}
mv ode/src/.libs/libode-double.so.%{somajor}.?.? .
make distclean
@@ -94,11 +102,11 @@ install -m 644 ode-double.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig
%files
-%doc CHANGELOG.txt LICENSE*.TXT README.txt
+%doc CHANGELOG.txt *COPYING *LICENSE*.TXT README.md
%{_libdir}/libode.so.%{somajor}*
%files double
-%doc CHANGELOG.txt LICENSE*.TXT README.txt
+%doc CHANGELOG.txt *COPYING *LICENSE*.TXT README.md
%{_libdir}/libode-double.so.%{somajor}*
%files devel
@@ -112,6 +120,10 @@ install -m 644 ode-double.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig
%changelog
+* Wed Oct 29 2014 Hans de Goede <hdegoede at redhat.com> - 0.13.1-1
+- Fix URLs to point to new upstream (rhbz#1131050)
+- Update to 0.13.1 (rhbz#1131050)
+
* Sun Aug 17 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.12-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
diff --git a/sources b/sources
index 04d0fab..bfeafd3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-48fdd41fae1a7e7831feeded09826599 ode-0.12.tar.bz2
+00f6613b3d8e5249be60e3a513d6aebd ode-0.13.1.tar.gz
More information about the scm-commits
mailing list