Accepting request 1085525 from home:1Antoine1:branches:Education

Update to version 4.2.

Lot of changes since 2.X, see https://golly.sourceforge.net/Help/changes.html.

Note that a lot of builds are failing because they are missing wxWidgets >= 3.1.5 with wxWebRequests enabled. This has been recently introduced in Tumbleweed (https://build.opensuse.org/request/show/1084562). Tumbleweed ports (i586, aarch64) seem not to have included it yet. For Leap builds, I doubt there is a demand for backport.

Maybe the solution would be to link (or aggregate) wxWidgets-3_2 from project X11:wxWidgets to project Education, for the versions of openSUSE which are currently failing.

OBS-URL: https://build.opensuse.org/request/show/1085525
OBS-URL: https://build.opensuse.org/package/show/Education/golly?expand=0&rev=5

golly-2.2-src.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:cf7fbfd3df3c4cefcd7c4cc881011b2128f7255aacb6c79e93b7f10d3640abc2
-size 2535583

golly-2.6-src.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1fe2f983144bc895eaa1242f95c5bb49344cc0139b5c3309e6b4fa219c1f33d8
-size 3545388

golly-4.2-src.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:569128a923da64c3ff0062186406e4e51fdff02aeabf1f292983753bd065e95d
+size 15348982

golly.changes

@@ -1,3 +1,33 @@
+-------------------------------------------------------------------
+Thu Apr 27 20:59:46 UTC 2023 - antoine.belvire@opensuse.org
+
+- Update to version 4.2:
+  * Fixed a bug in script commands like g.setpos that accept
+    integers as strings.
+  * Fixed a number of bugs that could result in an "illegal
+    operation while calculating" warning.
+  * Performance improvements to Larger than Life NL (Triangular)
+    and NB (Checkerboard) rules.
+  * Updated Lua to version 5.4.4.
+  * Added support for https links when downloading files from
+    online archives.
+  * New patterns, mostly in OCA (non-Conway's Life) rules, plus
+    updates to Life stamp collections.
+  * Moved/renamed whiteboard-17c2415-spaceship.rle,
+    sierpinski-builder.rle, wolfram22.mc.
+  * Reorganized patterns in HashLife folder into subfolders
+    "Construction", "Eventful", and "Metacell".
+  * Links and dates in many pattern comments updated to standard
+    format.
+- Changes of versions 4.1, 4.0, 3.4, 3.3, 3.2, 3.1, 3.0, 2.8, 2.7:
+  See https://golly.sourceforge.net/Help/changes.html.
+- Drop Perl dependencies: Perl scripting has been replaced by Lua
+  scripting. golly is built against a patched version of Lua
+  included in sources.
+- Modify desktop file to run with GDK_BACKEND=x11: Allow to run the
+  application built against wxWidgets without EGL support.
+- Refreshed spec file.
+
 -------------------------------------------------------------------
 Wed Mar 19 08:37:00 UTC 2014 - avvissu@yandex.ru
 

golly.desktop

@@ -1,7 +1,8 @@
 [Desktop Entry]
 Name=Golly
 GenericName=Golly cellular automata simulator
-Exec=golly
+# Run with the X11 backend until wxWidgets is built with EGL support
+Exec=env GDK_BACKEND=x11 golly
 Icon=golly
 Terminal=false
 Type=Application

golly.png

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:244d7975826a873ddb318dd3f7540d03867d42175f738507fc2c96d1c711a5f6
-size 308

golly.spec

@@ -1,38 +1,40 @@
 #
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# spec file for package golly
+#
+# Copyright (c) 2023 SUSE LLC
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
-%if 0%{?suse_version} == 1110
+
-%define number  2.2
-%else
-%define number  2.6 
-%endif
 Name:           golly
-Version:        %{number}
+Version:        4.2
-Release:        1
+Release:        0
-License:        GPL-2.0+
 Summary:        Tool for exploring Game of Life and other automata
-Url:            http://golly.sourceforge.net/
+License:        GPL-2.0-or-later
 Group:          Amusements/Toys/Graphics
-Source:         %{name}-%{version}-src.tar.gz
+URL:            https://golly.sourceforge.net/
-Source1:        %{name}.png
+Source0:        https://downloads.sourceforge.net/%{name}/%{name}-%{version}-src.tar.gz
-Source2:        %{name}.desktop
+Source1:        %{name}.desktop
-BuildRequires:  gcc-c++ cmake
+BuildRequires:  SDL2-devel
+BuildRequires:  c++_compiler
+BuildRequires:  chrpath
+BuildRequires:  desktop-file-utils
 BuildRequires:  fdupes
-%if 0%{?fedora}
+BuildRequires:  python3-devel
-BuildRequires:  perl-devel perl-ExtUtils-Embed
+BuildRequires:  wxGTK3-devel >= 3.1.5
-%else
-BuildRequires:  perl update-desktop-files
-%endif
-BuildRequires:  python-devel
-%if 0%{?suse_version} == 1110 || 0%{?fedora}
-BuildRequires:  wxGTK-devel 
-%else
-BuildRequires:  wxWidgets-devel 
-%endif
 BuildRequires:  zlib-devel
-BuildRequires:  desktop-file-utils 
+Requires:       %{name}-assets = %{version}
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+Requires:       python3 >= 3.3
 
 %description
 Key features:
@@ -57,102 +59,66 @@ Key features:
 - Full screen option (no menu/status/tool/scroll bars).
 - Supports multiple layers, including cloned layers.
 - HTML-based help with an integrated Life Lexicon.
-- Scriptable via Perl or Python.
+- Scriptable via Lua or Python.
 - User-configurable keyboard shortcuts.
 
+%package assets
+Summary:        Assets for %{name}
+Group:          Amusements/Toys/Graphics
+BuildArch:      noarch
+
+%description assets
+This package contains assets for %{name}: Help, rules, patterns and scripts.
+
 %package devel
 Summary:        Development files for %{name}
 Group:          Development/Libraries/C and C++
-License:        GPL-2.0+
 Requires:       %{name} = %{version}
 
 %description devel
-This package contains, header files and libraries needed to
+This package contains header files and libraries needed to develop applications
-develop application that use %{name}
+that use %{name}.
-
-%package -n %{name}-devel-static
-Summary:        Development files and libraries for %{name}
-Group:          Development/Libraries/C and C++
-License:        GPL-2.0+
-Requires:       %{name}-devel = %{version}
-
-%description -n %{name}-devel-static
-This package contains, header files and libraries needed to
-develop application that use %{name}
 
 %prep
 %setup -q -n %{name}-%{version}-src
+rm -v {Help/Lexicon/modify.pl,docs/Build.html}
 
 %build
-export CFLAGS="%{optflags}"
+%set_build_flags
-export CXXFLAGS="$CFLAGS"
+export GOLLYDIR=%{_datadir}/%{name}
-
-%if 0%{?suse_version} == 1110
-make %{?_smp_mflags} ZLIB_LDFLAGS=-lz -f makefile-gtk
-%else
 cd gui-wx
-mkdir build
+%make_build -f makefile-gtk 
-pushd build
-cmake ../    
-make %{?_smp_mflags}
-popd
-%endif
 
 %install
-install -d %{buildroot}%{_bindir}
+install -D -m 0755 bgolly golly -t %{buildroot}%{_bindir}
-install -m 0755 bgolly golly %{buildroot}%{_bindir}
+install -d %{buildroot}%{_datadir}/%{name}
-%if 0%{?suse_version} >= 1140 || 0%{?fedora}
-install -D -m 0644 gui-wx/build/libgollybase.a %{buildroot}%{_libdir}/libgollybase.a
-%endif
-
-rm -f {Help/Lexicon/modify.pl,docs/Build.html}
-
-# install data files
-mkdir -p %{buildroot}%{_datadir}/%{name}
 for i in Help Patterns Rules Scripts; do
   find ./$i -type d -exec chmod 755 {} \;
   find ./$i -type f -exec chmod 644 {} \;
   cp -a $i %{buildroot}%{_datadir}/%{name}/$i
 done
-
+install -D -m 0644 gui-wx/icons/appicon.xpm %{buildroot}%{_datadir}/pixmaps/%{name}.xpm
-install -D -m 0644 %{SOURCE1} %{buildroot}%{_datadir}/pixmaps/%{name}.png
+install -D -m 0644 %{SOURCE1} -t %{buildroot}%{_datadir}/applications
-install -D -m 0644 %{SOURCE2} %{buildroot}%{_datadir}/applications/%{name}.desktop
-
-%if 0%{?suse_version}
-%suse_update_desktop_file %{name}
-%endif
-
 %fdupes %{buildroot}%{_datadir}
+chrpath --delete %{buildroot}%{_bindir}/*golly
 
 %check
 desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
 
-%clean
-rm -rf %{buildroot}
-
 %files
-%defattr(-,root,root,-)
+%license docs/License.html
-%if 0%{?suse_version} == 1110
+%doc docs/ReadMe.html docs/ToDo.html
-%doc LICENSE README TODO
-%else
-%doc docs/License.* docs/ReadMe.* docs/ToDo.*
-%endif
 %{_bindir}/*%{name}
-%{_datadir}/%{name}
 %{_datadir}/applications/%{name}.desktop
-%{_datadir}/pixmaps/%{name}.png
+%{_datadir}/pixmaps/%{name}.xpm
+
+%files assets
+%{_datadir}/%{name}
 %exclude %{_datadir}/%{name}/Rules/TableGenerators
 %exclude %{_datadir}/%{name}/Rules/TreeGenerators
 
 %files devel
-%defattr(-,root,root,-)
 %{_datadir}/%{name}/Rules/TableGenerators
 %{_datadir}/%{name}/Rules/TreeGenerators
 
-%if 0%{?suse_version} >= 1140 || 0%{?fedora}
-%files -n %{name}-devel-static
-%defattr(-,root,root,-)
-%{_libdir}/libgollybase.a
-%endif
-
 %changelog