- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

.gitignore

@@ -1,2 +1,5 @@
 simspark-0.2.1.tar.gz
 /simspark-0.2.2.tar.gz
+/simspark-0.2.3.tar.gz
+/simspark-0.2.4.tar.gz
+/simspark-0.3.0.tar.gz

simspark-0.2.2-logviewerfix.patch

@@ -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<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;

simspark-odefix.patch

@@ -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

simspark.spec

@@ -1,22 +1,19 @@
 Name:           simspark
-Version:        0.2.2
-Release:        3%{?dist}
+Version:        0.3.0
+Release:        14%{?dist}
 Summary:        Spark physical simulation system
 
-Group:          Development/Libraries
 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
 
-BuildRequires:  cmake boost-devel ruby ruby-devel SDL-devel tex(latex)
+BuildRequires:  gcc gcc-c++ cmake boost-devel ruby ruby-devel SDL-devel tex(latex)
 BuildRequires:  ode-devel libGL-devel DevIL-devel freetype-devel libGLU-devel
-BuildRequires:  ImageMagick
+BuildRequires:  ImageMagick tex(titlesec.sty) tex(wrapfig.sty)
+BuildRequires:  tex(subfigure.sty) qt-devel
 Conflicts:      rcssserver3d < 0.6.1
-Requires:       ruby ruby(abi) = 1.8
+Requires:       ruby ruby(release)
 Requires:       dejavu-sans-mono-fonts
 
 %description
@@ -26,7 +23,6 @@ In these simulations, agents can participate as external processes.
 
 %package        devel
 Summary:        Development files for %{name}
-Group:          Development/Libraries
 Requires:       %{name}%{?_isa} = %{version}-%{release}
 Requires:       boost-devel%{?_isa} ruby-devel%{?_isa} ode-devel%{?_isa}
 Requires:       DevIL-devel%{?_isa} libGL-devel libGLU-devel
@@ -38,15 +34,14 @@ developing applications that use %{name}.
 %prep
 %setup -q
 %patch0 -p1 -b .mlibfix
-%patch1 -p1 -b .odefix
-%patch2 -p1 -b .logviewerfix
 
 %build
 mkdir build
 cd build
-export CXXFLAGS="${CXXFLAGS:-%optflags}"
+export CXXFLAGS="${CXXFLAGS:-%optflags} -std=gnu++98"
 export CFLAGS="${CFLAGS:-%optflags}"
-cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} -DLIBDIR:PATH=%{_lib} -DODE_CONFIG_EXEC=ode-double-config ..
+cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} -DLIBDIR:PATH=%{_lib} -DODE_CONFIG_EXEC=ode-double-config .. \
+  -DRUBY_INCLUDE_PATH=`ruby -e 'puts File.join(RbConfig::CONFIG[%q(includedir)], RbConfig::CONFIG[%q(sitearch)])'`
 make VERBOSE=1 %{?_smp_mflags}
 make pdf
 cp doc/devel/manual.pdf ../doc/devel/
@@ -63,23 +58,177 @@ 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
 # they can't be moved to -devel package
 %{_libdir}/%{name}/[^l]*.so*
 %{_libdir}/%{name}/lib*.so.*
+%{_libdir}/gui*/*.so
 %{_datadir}/%{name}
+%{_datadir}/carbon
 
 %files devel
-%defattr(-,root,root,-)
 %{_bindir}/*
 %{_includedir}/%{name}
+%{_includedir}/gui*
 %{_libdir}/%{name}/lib*.so
 %doc doc/devel/howtos doc/devel/manual.pdf
 
 %changelog
+* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.3.0-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.3.0-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Fri Jan 25 2019 Jonathan Wakely <jwakely@redhat.com> - 0.3.0-12
+- Rebuilt for Boost 1.69
+
+* Mon Jan 21 2019 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.3.0-11
+- F-30: rebuild against ruby26
+
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.3.0-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Sun Feb 18 2018 Hedayat Vatankhah <hedayat.fwd+rpmchlog@gmail.com> - 0.3.0-9
+- Add gcc-c++ build dependency
+
+* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.3.0-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Tue Jan 23 2018 Jonathan Wakely <jwakely@redhat.com> - 0.3.0-7
+- Rebuilt for Boost 1.66
+
+* Fri Jan 05 2018 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.3.0-6
+- F-28: rebuild for ruby25
+
+* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.3.0-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.3.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Wed Jul 19 2017 Jonathan Wakely <jwakely@redhat.com> - 0.3.0-3
+- Rebuilt for s390x binutils bug
+
+* Tue Jul 04 2017 Jonathan Wakely <jwakely@redhat.com> - 0.3.0-2
+- Rebuilt for Boost 1.64
+
+* Fri Mar 24 2017 Hedayat Vatankhah <hedayat.fwd+rpmchlog@gmail.com> - 0.3.0-1
+- New upstream version with Carbon: a gui & simulation framework
+
+* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.4-24
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Fri Jan 27 2017 Jonathan Wakely <jwakely@redhat.com> - 0.2.4-23
+- Rebuilt for Boost 1.63
+
+* Fri Jan 13 2017 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.2.4-22
+- F-26: rebuild for ruby24
+
+* Tue May 17 2016 Jonathan Wakely <jwakely@redhat.com> - 0.2.4-21
+- Rebuilt for linker errors in boost (#1331983)
+
+* Thu Mar 03 2016 Hedayat Vatankhah <hedayat.fwd+rpmchlog@gmail.com> - 0.2.4-20
+- Fix compilation on GCC 6.0
+
+* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.4-19
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Fri Jan 15 2016 Jonathan Wakely <jwakely@redhat.com> - 0.2.4-18
+- Rebuilt for Boost 1.60
+
+* Wed Jan 13 2016 Vít Ondruch <vondruch@redhat.com> - 0.2.4-17
+- Rebuilt for https://fedoraproject.org/wiki/Changes/Ruby_2.3
+
+* Thu Aug 27 2015 Jonathan Wakely <jwakely@redhat.com> - 0.2.4-16
+- Rebuilt for Boost 1.59
+
+* Wed Jul 29 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.2.4-15
+- Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159
+
+* Wed Jul 22 2015 David Tardon <dtardon@redhat.com> - 0.2.4-14
+- rebuild for Boost 1.58
+
+* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.2.4-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Sat May 02 2015 Kalev Lember <kalevlember@gmail.com> - 0.2.4-12
+- Rebuilt for GCC 5 C++11 ABI change
+
+* Tue Jan 27 2015 Petr Machata <pmachata@redhat.com> - 0.2.4-11
+- Rebuild for boost 1.57.0
+
+* Fri Jan 16 2015 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.2.4-10
+- Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_2.2
+
+* Thu Oct 30 2014 Hedayat Vatankhah <hedayat.fwd+rpmchlog@gmail.com> - 0.2.4-9
+- Rebuild due to new ODE version (so version bump)
+
+* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.2.4-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.2.4-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Fri May 23 2014 Petr Machata <pmachata@redhat.com> - 0.2.4-6
+- Rebuild for boost 1.55.0
+
+* Tue Apr 29 2014 Vít Ondruch <vondruch@redhat.com> - 0.2.4-5
+- Rebuilt for https://fedoraproject.org/wiki/Changes/Ruby_2.1
+
+* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.2.4-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Sat Jul 27 2013 pmachata@redhat.com - 0.2.4-3
+- Rebuild for boost 1.54.0
+
+* Sun Jul 21 2013 Hedayat Vatankhah <hedayat.fwd+rpmchlog@gmail.com> - 0.2.4-2
+- Fix update path from f17/f18
+
+* Tue Jun 18 2013 Hedayat Vatankhah <hedayat.fwd+rpmchlog@gmail.com> - 0.2.4-1
+- Update to new upstream release: 0.2.4
+
+* Wed Mar 27 2013 Vít Ondruch <vondruch@redhat.com> - 0.2.3-6
+- Rebuild for https://fedoraproject.org/wiki/Features/Ruby_2.0.0
+
+* Tue Feb 12 2013 Hedayat Vatankhah <hedayat.fwd+rpmchlog@gmail.com> - 0.2.3-5
+- Fixed compilation with boost 1.53
+- Fix TeXLive dependencies for Fedora 19
+
+* Sat Feb 09 2013 Denis Arnaud <denis.arnaud_fedora@m4x.org> - 0.2.3-4
+- Rebuild for Boost-1.53.0
+
+* Wed Aug 15 2012 Hedayat Vatankhah <hedayat.fwd+rpmchlog@gmail.com> - 0.2.3-3
+- Rebuild for Boost 1.50
+
+* Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.2.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Tue May 22 2012 Hedayat Vatankhah <hedayat.fwd+rpmchlog@gmail.com> - 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 <rel-eng@lists.fedoraproject.org> - 0.2.2-9
+- Rebuilt for c++ ABI breakage
+
+* Thu Feb 16 2012 Hedayat Vatankhah <hedayat.fwd+rpmchlog@gmail.com> - 0.2.2-8
+- Fix compilation under gcc 4.7
+
+* Wed Feb 08 2012 Bohuslav Kabrda <bkabrda@redhat.com> - 0.2.2-7
+- Rebuilt for Ruby 1.9.3.
+
+* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.2.2-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Mon Nov 21 2011 Hedayat Vatankhah <hedayat.fwd+rpmchlog@gmail.com> - 0.2.2-5
+- Rebuild for Boost 1.48
+
+* Fri Jul 22 2011 Hedayat Vatankhah <hedayat.fwd+rpmchlog@gmail.com> - 0.2.2-4
+- Rebuild for boost 1.47
+
 * Sat Apr 30 2011 Hedayat Vatankhah <hedayat.fwd+rpmchlog@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
@@ -124,7 +273,7 @@ rm -rf %{buildroot}/%{_datadir}/doc
 * Wed Mar 18 2009 Hedayat Vatankhah <hedayat@grad.com> 0.1-3
 - fixed lib directory variable for cmake
 
-* Thu Mar 17 2009 Hedayat Vatankhah <hedayat@grad.com> 0.1-2
+* Tue Mar 17 2009 Hedayat Vatankhah <hedayat@grad.com> 0.1-2
 - Added cmake and DevIL patches
 - Removed redundant gcc-c++ requirement
 - Add verbose output for make

sources

@@ -1 +1 @@
-b93320a0c6794766cab6bd37b6081d12  simspark-0.2.2.tar.gz
+SHA512 (simspark-0.3.0.tar.gz) = 1d39574e2226bebb2a0e30969ad1fce77c56201b4abf9da6627304f7d17e8a2466285e38c1683f642882a58c9e413a7384d7b0775d2a9fa9382774810fafbd17