diff --git a/.gitignore b/.gitignore index 513de62..7cbf4f6 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /gbrainy-2.4.2.tar.gz /gbrainy-2.4.3.tar.gz /gbrainy-2.4.4.tar.gz +/gbrainy-2.4.5.tar.gz diff --git a/a666287229dc3b0096ac18e7c753b53e4b85c102.patch b/a666287229dc3b0096ac18e7c753b53e4b85c102.patch deleted file mode 100644 index e43806e..0000000 --- a/a666287229dc3b0096ac18e7c753b53e4b85c102.patch +++ /dev/null @@ -1,61 +0,0 @@ -From a666287229dc3b0096ac18e7c753b53e4b85c102 Mon Sep 17 00:00:00 2001 -From: Jordi Mas -Date: Thu, 25 Aug 2022 10:42:18 +0200 -Subject: [PATCH] Remove code no longer need. Fixes compilation for - gtk-sharp3-3.22 from https://github.com/GLibSharp/GtkSharp - ---- - src/Clients/Classical/Widgets/BrowseFile.cs | 4 ---- - src/Clients/Classical/Widgets/Toolbar.cs | 5 ----- - 2 files changed, 9 deletions(-) - -diff --git a/src/Clients/Classical/Widgets/BrowseFile.cs b/src/Clients/Classical/Widgets/BrowseFile.cs -index 59c7394f..e0361fb0 100644 ---- a/src/Clients/Classical/Widgets/BrowseFile.cs -+++ b/src/Clients/Classical/Widgets/BrowseFile.cs -@@ -45,10 +45,6 @@ namespace gbrainy.Clients.Classical.Widgets - parent.Add (filename); - parent.Add (browse); - -- Gtk.Box.BoxChild box = (Gtk.Box.BoxChild) parent[browse]; -- box.Expand = false; -- box.Fill = false; -- - parent.ShowAll (); - } - -diff --git a/src/Clients/Classical/Widgets/Toolbar.cs b/src/Clients/Classical/Widgets/Toolbar.cs -index 8a6c2d46..108d6123 100644 ---- a/src/Clients/Classical/Widgets/Toolbar.cs -+++ b/src/Clients/Classical/Widgets/Toolbar.cs -@@ -46,7 +46,6 @@ namespace gbrainy.Clients.Classical.Widgets - - public void Attach (Gtk.Orientation orientation_new) - { -- Gtk.Box.BoxChild child = null; - Box box; - - switch (Orientation) { -@@ -80,19 +79,15 @@ namespace gbrainy.Clients.Classical.Widgets - case Gtk.Orientation.Vertical: - main_hbox.Add (this); - main_hbox.ReorderChild (this, 0); -- child = ((Gtk.Box.BoxChild)(main_hbox[this])); - break; - case Gtk.Orientation.Horizontal: - framework_vbox.Add (this); - framework_vbox.ReorderChild (this, 1); -- child = ((Gtk.Box.BoxChild)(framework_vbox[this])); - break; - default: - throw new InvalidOperationException (); - } - -- child.Expand = false; -- child.Fill = false; - ShowAll (); - InitCompleted = true; - } --- -GitLab - diff --git a/gbrainy.spec b/gbrainy.spec index 6a0f7c5..74e9ce4 100644 --- a/gbrainy.spec +++ b/gbrainy.spec @@ -2,9 +2,9 @@ %global debug_package %{nil} Name: gbrainy -Version: 2.4.4 +Version: 2.4.5 Epoch: 1 -Release: 3%{?dist} +Release: 1%{?dist} Summary: A brain teaser game and trainer to keep your brain trained License: GPLv2 @@ -12,10 +12,6 @@ URL: https://wiki.gnome.org/Apps/gbrainy Source0: https://gent.softcatala.org/jmas/%{name}/%{name}-%{version}.tar.gz # To fix 460353 : Patch0: %{name}-fix-location.patch -# used to fix FTBFS fedora 37+ (remove in the next upstream version) -# https://gitlab.gnome.org/GNOME/gbrainy/-/commit/a666287229dc3b0096ac18e7c753b53e4b85c102.patch -Patch1: a666287229dc3b0096ac18e7c753b53e4b85c102.patch - BuildRequires: desktop-file-utils BuildRequires: gcc BuildRequires: gtk-sharp3-devel @@ -24,7 +20,7 @@ BuildRequires: itstool BuildRequires: librsvg2-devel BuildRequires: mono-devel BuildRequires: yelp-tools -BuildRequires: make +BuildRequires: make # Mono only available on these: ExclusiveArch: %mono_arches @@ -50,9 +46,7 @@ This package provides the necessary development libraries and headers for writing gbrainy applications. %prep -%setup -q -%patch0 -p0 -%patch1 -p1 +%autosetup -p0 sed -i -e 's!{exec_prefix}/lib!%{_libdir}!' data/gbrainy.pc.in echo "sed done $PWD" @@ -97,6 +91,9 @@ chmod a-x $RPM_BUILD_ROOT%{_libdir}/%{name}/%{name}.exe.config %{_libdir}/pkgconfig/gbrainy.pc %changelog +* Wed Sep 07 2022 Filipe Rosset - 1:2.4.5-1 +- Update to 2.4.5 remove upstreamed patch + * Fri Aug 26 2022 Filipe Rosset - 1:2.4.4-3 - Fix FTBFS Fedora 37+ diff --git a/sources b/sources index 2df0322..4987e3f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gbrainy-2.4.4.tar.gz) = 236836e8f2c50008b2fed3a8d0bdd91f02072abca5b7629ae9dcf6132bc749efd47bd61074778a89ec907b2cb5bb86020e0aceaf9ce5c65877d5033c3b3f3c74 +SHA512 (gbrainy-2.4.5.tar.gz) = f7d1914ee89f1475cca27a5efa8d8d295d4d2d5803e3e50cc1d7cbf59b6f4b1e9e54e2263641c4fcba173bd3a7c3b0a1d2da68986af29f774ad44c1a0dc3b6a4