[simspark] Added an upstream patch on the log viewer to fix a crash in logviewer Make -devel dependencies arch

[Hedayat Vatankhah]

commit 2049cfc350142fc4d2a7da0470c78a2e0058e1ab
Author: Hedayat Vatankhah <hedayat.fwd at gmail.com>
Date:   Sat Apr 30 13:40:00 2011 +0430

    Added an upstream patch on the log viewer to fix a crash in logviewer
    Make -devel dependencies arch specific, and also base package dependency
    Cleanup: clean section, buildroot tag

 simspark-0.2.2-logviewerfix.patch |   28 ++++++++++++++++++++++++++++
 simspark.spec                     |   20 +++++++++++---------
 2 files changed, 39 insertions(+), 9 deletions(-)
---
diff --git a/simspark-0.2.2-logviewerfix.patch b/simspark-0.2.2-logviewerfix.patch
new file mode 100644
index 0000000..8fc3bd6
--- /dev/null
+++ b/simspark-0.2.2-logviewerfix.patch
@@ -0,0 +1,28 @@
+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<BaseNode>(*iter);
+                         if (iter != root->end())
+                         {
++                            node = shared_dynamic_cast<BaseNode>(*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.spec b/simspark.spec
index ec586f4..30852f4 100644
--- a/simspark.spec
+++ b/simspark.spec
@@ -1,6 +1,6 @@
 Name:           simspark
 Version:        0.2.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Spark physical simulation system
 
 Group:          Development/Libraries
@@ -10,7 +10,7 @@ Source0:        http://downloads.sourceforge.net/simspark/%{name}-%{version}.tar
 Patch0:         %{name}-confscript-mlibfix.patch
 # Applied upstream
 Patch1:         %{name}-odefix.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch2:         %{name}-0.2.2-logviewerfix.patch
 
 BuildRequires:  cmake boost-devel ruby ruby-devel SDL-devel tex(latex)
 BuildRequires:  ode-devel libGL-devel DevIL-devel freetype-devel libGLU-devel
@@ -27,9 +27,9 @@ In these simulations, agents can participate as external processes.
 %package        devel
 Summary:        Development files for %{name}
 Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
-Requires:       boost-devel ruby-devel ode-devel DevIL-devel
-Requires:       libGL-devel libGLU-devel
+Requires:       %{name}%{?_isa} = %{version}-%{release}
+Requires:       boost-devel%{?_isa} ruby-devel%{?_isa} ode-devel%{?_isa}
+Requires:       DevIL-devel%{?_isa} libGL-devel libGLU-devel
 
 %description    devel
 The %{name}-devel package contains libraries and header files for
@@ -39,6 +39,7 @@ developing applications that use %{name}.
 %setup -q
 %patch0 -p1 -b .mlibfix
 %patch1 -p1 -b .odefix
+%patch2 -p1 -b .logviewerfix
 
 %build
 mkdir build
@@ -51,7 +52,6 @@ make pdf
 cp doc/devel/manual.pdf ../doc/devel/
 
 %install
-rm -rf %{buildroot}
 make -C build install DESTDIR=%{buildroot}
 
 ln -fs %{_datadir}/fonts/dejavu/DejaVuSansMono.ttf \
@@ -62,9 +62,6 @@ mkdir package_docs
 mv %{buildroot}/%{_datadir}/doc/%{name}/* package_docs/
 rm -rf %{buildroot}/%{_datadir}/doc
 
-%clean
-rm -rf %{buildroot}
-
 %files
 %defattr(-,root,root,-)
 %doc package_docs/*
@@ -83,6 +80,11 @@ rm -rf %{buildroot}
 %doc doc/devel/howtos doc/devel/manual.pdf
 
 %changelog
+* Sat Apr 30 2011 Hedayat Vatankhah <hedayat.fwd+rpmchlog at gmail.com> - 0.2.2-3
+- Added an upstream patch on the log viewer to fix a crash in logviewer
+- Make -devel dependencies arch specific, and also base package dependency
+- Cleanup: clean section, buildroot tag
+
 * Wed Apr 27 2011 Hedayat Vatankhah <hedayat.fwd+rpmchlog at gmail.com> - 0.2.2-2
 - Link against the correct ode library