From ff721480adac883d37bc021e8b25531170eb9494 Mon Sep 17 00:00:00 2001 From: Hedayat Vatankhah Date: Wed, 23 May 2012 13:13:49 +0430 Subject: [PATCH] Update to new upstream version 0.2.3 - Remove some old .spec stuff (e.g. defattr's) - Fix bug #704861 --- .gitignore | 1 + simspark-0.2.2-gcc4.7fix.patch | 12 ----------- simspark-0.2.2-logviewerfix.patch | 28 ------------------------- simspark-odefix.patch | 34 ------------------------------- simspark.spec | 20 ++++++++---------- sources | 2 +- 6 files changed, 10 insertions(+), 87 deletions(-) delete mode 100644 simspark-0.2.2-gcc4.7fix.patch delete mode 100644 simspark-0.2.2-logviewerfix.patch delete mode 100644 simspark-odefix.patch diff --git a/.gitignore b/.gitignore index 78a81d1..a53f1a6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ simspark-0.2.1.tar.gz /simspark-0.2.2.tar.gz +/simspark-0.2.3.tar.gz diff --git a/simspark-0.2.2-gcc4.7fix.patch b/simspark-0.2.2-gcc4.7fix.patch deleted file mode 100644 index 8e895e8..0000000 --- a/simspark-0.2.2-gcc4.7fix.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up simspark-0.2.2/lib/salt/gmath.h.gcc4.7fix simspark-0.2.2/lib/salt/gmath.h ---- simspark-0.2.2/lib/salt/gmath.h.gcc4.7fix 2012-02-16 15:18:02.720627323 +0330 -+++ simspark-0.2.2/lib/salt/gmath.h 2012-02-16 15:18:24.423908724 +0330 -@@ -226,7 +226,7 @@ f_inline bool gIsFinite(TYPE f) - assert(std::numeric_limits::has_infinity); - return (std::numeric_limits::infinity() != f); - #else -- return isfinite(f); -+ return std::isfinite(f); - #endif - } - diff --git a/simspark-0.2.2-logviewerfix.patch b/simspark-0.2.2-logviewerfix.patch deleted file mode 100644 index 8fc3bd6..0000000 --- a/simspark-0.2.2-logviewerfix.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -up simspark-0.2.2/plugin/rubysceneimporter/rubysceneimporter.cpp.logviewerfix simspark-0.2.2/plugin/rubysceneimporter/rubysceneimporter.cpp ---- simspark-0.2.2/plugin/rubysceneimporter/rubysceneimporter.cpp.logviewerfix 2011-04-26 16:10:42.000000000 +0430 -+++ simspark-0.2.2/plugin/rubysceneimporter/rubysceneimporter.cpp 2011-04-30 13:12:41.605392015 +0430 -@@ -1004,9 +1004,9 @@ RubySceneImporter::ReadDeltaGraph(sexp_t - (Lookup(string(sub->val)) == S_NODE) - ) - { -- node = shared_dynamic_cast(*iter); - if (iter != root->end()) - { -+ node = shared_dynamic_cast(*iter); - ++iter; - } - } else { -diff -up simspark-0.2.2/plugin/sparkmonitor/sparkmonitorlogfileserver.cpp.logviewerfix simspark-0.2.2/plugin/sparkmonitor/sparkmonitorlogfileserver.cpp ---- simspark-0.2.2/plugin/sparkmonitor/sparkmonitorlogfileserver.cpp.logviewerfix 2011-04-26 16:10:43.000000000 +0430 -+++ simspark-0.2.2/plugin/sparkmonitor/sparkmonitorlogfileserver.cpp 2011-04-30 13:12:53.212392002 +0430 -@@ -111,10 +111,6 @@ void SparkMonitorLogFileServer::DoneSimu - - void SparkMonitorLogFileServer::StartCycle() - { -- // work around a random crash! -- if (GetTime() < 0.1) -- return; -- - if (mPause && !mForwardStep) - { - return; diff --git a/simspark-odefix.patch b/simspark-odefix.patch deleted file mode 100644 index c2aeb4e..0000000 --- a/simspark-odefix.patch +++ /dev/null @@ -1,34 +0,0 @@ -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 e22462e..22d4b2a 100644 --- a/simspark.spec +++ b/simspark.spec @@ -1,6 +1,6 @@ Name: simspark -Version: 0.2.2 -Release: 9%{?dist} +Version: 0.2.3 +Release: 1%{?dist} Summary: Spark physical simulation system Group: Development/Libraries @@ -8,10 +8,6 @@ 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 -Patch2: %{name}-0.2.2-logviewerfix.patch -Patch3: %{name}-0.2.2-gcc4.7fix.patch BuildRequires: cmake boost-devel ruby ruby-devel SDL-devel tex(latex) BuildRequires: ode-devel libGL-devel DevIL-devel freetype-devel libGLU-devel @@ -39,9 +35,6 @@ developing applications that use %{name}. %prep %setup -q %patch0 -p1 -b .mlibfix -%patch1 -p1 -b .odefix -%patch2 -p1 -b .logviewerfix -%patch3 -p1 -b .gcc4.7fix %build mkdir build @@ -66,7 +59,6 @@ mv %{buildroot}/%{_datadir}/doc/%{name}/* package_docs/ rm -rf %{buildroot}/%{_datadir}/doc %files -%defattr(-,root,root,-) %doc package_docs/* %dir %{_libdir}/%{name} # Notice: the package needs .so files for running so @@ -76,18 +68,22 @@ rm -rf %{buildroot}/%{_datadir}/doc %{_datadir}/%{name} %files devel -%defattr(-,root,root,-) %{_bindir}/* %{_includedir}/%{name} %{_libdir}/%{name}/lib*.so %doc doc/devel/howtos doc/devel/manual.pdf %changelog +* Tue May 22 2012 Hedayat Vatankhah - 0.2.3-1 +- Update to new upstream version 0.2.3 +- Remove some old .spec stuff (e.g. defattr's) +- Fix bug #704861 + * Tue Feb 28 2012 Fedora Release Engineering - 0.2.2-9 - Rebuilt for c++ ABI breakage * Thu Feb 16 2012 Hedayat Vatankhah - 0.2.2-8 -- fix compilation under gcc 4.7 +- Fix compilation under gcc 4.7 * Wed Feb 08 2012 Bohuslav Kabrda - 0.2.2-7 - Rebuilt for Ruby 1.9.3. diff --git a/sources b/sources index c7f4496..5e70d30 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b93320a0c6794766cab6bd37b6081d12 simspark-0.2.2.tar.gz +b653af47b014b0af99d5dda1e3949d7b simspark-0.2.3.tar.gz