From 37b3902dbbc6fafb0aeb7b1ff5b336676b12b392 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Sun, 17 Apr 2011 13:25:49 +0300 Subject: [PATCH 1/4] Rebuilt for boost 1.46.1 soname bump --- simspark.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/simspark.spec b/simspark.spec index 7303dd4..e6fc0c6 100644 --- a/simspark.spec +++ b/simspark.spec @@ -1,6 +1,6 @@ Name: simspark Version: 0.2.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Spark physical simulation system Group: Development/Libraries @@ -80,6 +80,9 @@ rm -rf %{buildroot} %doc doc/devel/howtos doc/devel/manual.pdf %changelog +* Sun Apr 17 2011 Kalev Lember - 0.2.1-5 +- Rebuilt for boost 1.46.1 soname bump + * Wed Feb 09 2011 Fedora Release Engineering - 0.2.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From 58b6686d55f3cd56d8d330807689cf4f28b1c09b Mon Sep 17 00:00:00 2001 From: Hedayat Vatankhah Date: Wed, 27 Apr 2011 12:17:32 +0430 Subject: [PATCH 2/4] Updated to upstream 0.2.2 release --- .gitignore | 1 + simspark.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 27f202d..78a81d1 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ simspark-0.2.1.tar.gz +/simspark-0.2.2.tar.gz diff --git a/simspark.spec b/simspark.spec index e6fc0c6..af0704d 100644 --- a/simspark.spec +++ b/simspark.spec @@ -1,6 +1,6 @@ Name: simspark -Version: 0.2.1 -Release: 5%{?dist} +Version: 0.2.2 +Release: 1%{?dist} Summary: Spark physical simulation system Group: Development/Libraries @@ -42,7 +42,7 @@ mkdir build cd build export CXXFLAGS="${CXXFLAGS:-%optflags}" export CFLAGS="${CFLAGS:-%optflags}" -cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} -DLIBDIR:PATH=%{_lib} .. +cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} -DLIBDIR:PATH=%{_lib} -DODE_CONFIG_EXEC=ode-double-config .. make VERBOSE=1 %{?_smp_mflags} make pdf cp doc/devel/manual.pdf ../doc/devel/ @@ -80,6 +80,9 @@ rm -rf %{buildroot} %doc doc/devel/howtos doc/devel/manual.pdf %changelog +* Wed Apr 27 2011 Hedayat Vatankhah - 0.2.2-1 +- Updated to latest release 0.2.2 + * Sun Apr 17 2011 Kalev Lember - 0.2.1-5 - Rebuilt for boost 1.46.1 soname bump diff --git a/sources b/sources index 1af9389..c7f4496 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -068eef4a50ba4318c1cc0169a0618047 simspark-0.2.1.tar.gz +b93320a0c6794766cab6bd37b6081d12 simspark-0.2.2.tar.gz From a7504aebecb2e0470dfea0bda36f5b39fd5d3312 Mon Sep 17 00:00:00 2001 From: Hedayat Vatankhah Date: Wed, 27 Apr 2011 22:53:30 +0430 Subject: [PATCH 3/4] Link against the correct ode library --- simspark.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/simspark.spec b/simspark.spec index af0704d..ec586f4 100644 --- a/simspark.spec +++ b/simspark.spec @@ -1,6 +1,6 @@ Name: simspark Version: 0.2.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Spark physical simulation system Group: Development/Libraries @@ -8,6 +8,8 @@ License: GPLv2 URL: http://simspark.sourceforge.net Source0: http://downloads.sourceforge.net/simspark/%{name}-%{version}.tar.gz Patch0: %{name}-confscript-mlibfix.patch +# Applied upstream +Patch1: %{name}-odefix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: cmake boost-devel ruby ruby-devel SDL-devel tex(latex) @@ -36,6 +38,7 @@ developing applications that use %{name}. %prep %setup -q %patch0 -p1 -b .mlibfix +%patch1 -p1 -b .odefix %build mkdir build @@ -80,6 +83,9 @@ rm -rf %{buildroot} %doc doc/devel/howtos doc/devel/manual.pdf %changelog +* Wed Apr 27 2011 Hedayat Vatankhah - 0.2.2-2 +- Link against the correct ode library + * Wed Apr 27 2011 Hedayat Vatankhah - 0.2.2-1 - Updated to latest release 0.2.2 From 4b60a63f280472a9f37a11bcf0d2022ab4ff6186 Mon Sep 17 00:00:00 2001 From: Hedayat Vatankhah Date: Wed, 27 Apr 2011 22:53:30 +0430 Subject: [PATCH 4/4] Link against the correct ode library --- simspark-odefix.patch | 34 ++++++++++++++++++++++++++++++++++ simspark.spec | 8 +++++++- 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 simspark-odefix.patch diff --git a/simspark-odefix.patch b/simspark-odefix.patch new file mode 100644 index 0000000..c2aeb4e --- /dev/null +++ b/simspark-odefix.patch @@ -0,0 +1,34 @@ +diff -up simspark-0.2.2/cmake/FindODE.cmake.odefix simspark-0.2.2/cmake/FindODE.cmake +--- simspark-0.2.2/cmake/FindODE.cmake.odefix 2011-04-26 16:10:46.000000000 +0430 ++++ simspark-0.2.2/cmake/FindODE.cmake 2011-04-27 22:40:12.761590987 +0430 +@@ -60,7 +60,20 @@ IF (NOT ODE_FOUND) + ENDFOREACH(flag) + + SET(ODE_EXTRA_LDFLAGS ${ODE_CONFIG_LIBS}) +- ELSE("${ODE_CONFIG_RESULT}" MATCHES "^0$") ++ ++ # Convert the linker flags to a CMake list. ++ STRING(REGEX REPLACE " +" ";" ++ ODE_CONFIG_LIBS "${ODE_CONFIG_LIBS}") ++ ++ # Look for -l options. ++ FOREACH(flag ${ODE_CONFIG_LIBS}) ++ IF("${flag}" MATCHES "^-l.*ode.*") ++ STRING(REGEX REPLACE "^-l" "" ++ ODE_LIB_NAME "${flag}") ++ ENDIF("${flag}" MATCHES "^-l.*ode.*") ++ ENDFOREACH(flag) ++ ++ ELSE("${ODE_CONFIG_RESULT}" MATCHES "^0$") + MESSAGE("Error running ${ODE_CONFIG}: [${ODE_CONFIG_RESULT}]") + ENDIF("${ODE_CONFIG_RESULT}" MATCHES "^0$") + +@@ -79,7 +92,7 @@ IF (NOT ODE_FOUND) + NO_DEFAULT_PATH + ) + FIND_LIBRARY(ODE_LIBRARY +- NAMES ode ode_double ode_single ++ NAMES ${ODE_LIB_NAME} ode ode_double ode_single + PATHS + ${ODE_CONFIG_PREFIX}/lib + /usr/lib diff --git a/simspark.spec b/simspark.spec index af0704d..ec586f4 100644 --- a/simspark.spec +++ b/simspark.spec @@ -1,6 +1,6 @@ Name: simspark Version: 0.2.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Spark physical simulation system Group: Development/Libraries @@ -8,6 +8,8 @@ License: GPLv2 URL: http://simspark.sourceforge.net Source0: http://downloads.sourceforge.net/simspark/%{name}-%{version}.tar.gz Patch0: %{name}-confscript-mlibfix.patch +# Applied upstream +Patch1: %{name}-odefix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: cmake boost-devel ruby ruby-devel SDL-devel tex(latex) @@ -36,6 +38,7 @@ developing applications that use %{name}. %prep %setup -q %patch0 -p1 -b .mlibfix +%patch1 -p1 -b .odefix %build mkdir build @@ -80,6 +83,9 @@ rm -rf %{buildroot} %doc doc/devel/howtos doc/devel/manual.pdf %changelog +* Wed Apr 27 2011 Hedayat Vatankhah - 0.2.2-2 +- Link against the correct ode library + * Wed Apr 27 2011 Hedayat Vatankhah - 0.2.2-1 - Updated to latest release 0.2.2