diff --git a/.gitignore b/.gitignore index d6dfdba..9336dfd 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/gnome-system-monitor-46.alpha.tar.xz +SOURCES/gnome-system-monitor-46.0.tar.xz diff --git a/.gnome-system-monitor.metadata b/.gnome-system-monitor.metadata index d901977..52b62b0 100644 --- a/.gnome-system-monitor.metadata +++ b/.gnome-system-monitor.metadata @@ -1 +1 @@ -f32781fb369abc642150e3174326aa919ae06153 SOURCES/gnome-system-monitor-46.alpha.tar.xz +9c824e9981085ac5446502f101462abfe5c0dda4 SOURCES/gnome-system-monitor-46.0.tar.xz diff --git a/SOURCES/gnome-system-monitor-46.alpha-pointer-type-error.patch b/SOURCES/gnome-system-monitor-46.alpha-pointer-type-error.patch deleted file mode 100644 index 83abffa..0000000 --- a/SOURCES/gnome-system-monitor-46.alpha-pointer-type-error.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 07654d6c5f77631b3d77eafc8eafc9c4238a9ba3 Mon Sep 17 00:00:00 2001 -From: David King -Date: Mon, 22 Jan 2024 17:57:00 +0000 -Subject: [PATCH] Fix incompatible pointer type warnings - -Verified against GTK documentation. ---- - src/legacy/gsm_color_button.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/src/legacy/gsm_color_button.c b/src/legacy/gsm_color_button.c -index 367a29ac..1bee747f 100644 ---- a/src/legacy/gsm_color_button.c -+++ b/src/legacy/gsm_color_button.c -@@ -369,7 +369,8 @@ gsm_color_button_measure (GtkWidget*, - } - - static void --gsm_color_button_state_flags_changed (GtkWidget *self) -+gsm_color_button_state_flags_changed (GtkWidget *self, -+ GtkStateFlags) - { - gtk_widget_queue_draw (self); - } -@@ -422,7 +423,7 @@ gsm_color_button_released (GtkGestureClick*, - GtkColorChooserDialog *cc_dialog; - GtkWidget *parent; - -- parent = gtk_widget_get_root (GTK_WIDGET (color_button)); -+ parent = GTK_WIDGET (gtk_widget_get_root (GTK_WIDGET (color_button))); - - cc_dialog = GTK_COLOR_CHOOSER_DIALOG (gtk_color_chooser_dialog_new (priv->title, GTK_WINDOW (parent))); - --- -2.43.0 - diff --git a/SPECS/gnome-system-monitor.spec b/SPECS/gnome-system-monitor.spec index 160693c..e476a3a 100644 --- a/SPECS/gnome-system-monitor.spec +++ b/SPECS/gnome-system-monitor.spec @@ -5,15 +5,13 @@ %global tarball_version %%(echo %{version} | tr '~' '.') Name: gnome-system-monitor -Version: 46~alpha -Release: 3%{?dist} +Version: 46.0 +Release: 1%{?dist} Summary: Process and resource monitor License: GPL-2.0-or-later URL: https://wiki.gnome.org/Apps/SystemMonitor Source0: https://download.gnome.org/sources/%{name}/46/%{name}-%{tarball_version}.tar.xz -# https://gitlab.gnome.org/GNOME/gnome-system-monitor/-/merge_requests/121 -Patch: gnome-system-monitor-46.alpha-pointer-type-error.patch BuildRequires: gcc BuildRequires: gcc-c++ @@ -68,11 +66,14 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/gnome-system-monit %{_datadir}/icons/hicolor/scalable/apps/org.gnome.SystemMonitor*.svg %{_datadir}/icons/hicolor/symbolic/apps/org.gnome.SystemMonitor-symbolic.svg %{_datadir}/icons/hicolor/symbolic/apps/speedometer-symbolic.svg -%{_metainfodir}/gnome-system-monitor.appdata.xml +%{_metainfodir}/org.gnome.SystemMonitor.appdata.xml %{_datadir}/polkit-1/actions/org.gnome.gnome-system-monitor.policy %{_libexecdir}/gnome-system-monitor/ %changelog +* Thu Nov 21 2024 Tomas Popela - 46.0-1 +- Update to 46.0 + * Tue Oct 29 2024 Troy Dawson - 46~alpha-3 - Bump release for October 2024 mass rebuild: Resolves: RHEL-64018