diff --git a/.gitignore b/.gitignore index ba6b939..3f69983 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ workrave-1.9.1.tar.gz /workrave-v1_10_44.tar.gz /workrave-v1_10_45.tar.gz /workrave-v1_10_49.tar.gz +/workrave-v1_10_50.tar.gz diff --git a/578180d0982dd8f0dbe72574ae4758e6903691bb.patch b/578180d0982dd8f0dbe72574ae4758e6903691bb.patch new file mode 100644 index 0000000..91aa3a2 --- /dev/null +++ b/578180d0982dd8f0dbe72574ae4758e6903691bb.patch @@ -0,0 +1,23 @@ +From 578180d0982dd8f0dbe72574ae4758e6903691bb Mon Sep 17 00:00:00 2001 +From: Rob Caelers +Date: Wed, 24 Aug 2022 19:31:37 +0200 +Subject: [PATCH] Support GNOME Shell 43 + +# Conflicts: +# frontend/applets/gnome-shell/src/metadata.json.in +--- + frontend/applets/gnome-shell/src/metadata.json.in | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/frontend/applets/gnome-shell/src/metadata.json.in b/frontend/applets/gnome-shell/src/metadata.json.in +index 7070a1987..7f55d7a76 100644 +--- a/frontend/applets/gnome-shell/src/metadata.json.in ++++ b/frontend/applets/gnome-shell/src/metadata.json.in +@@ -26,6 +26,7 @@ + "40", + "41", + "42", ++ "43", + "@shell_current@" ], + "localedir": "@LOCALEDIR@", + "url": "@url@" diff --git a/sources b/sources index e1982f4..45d2d7f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (workrave-v1_10_49.tar.gz) = 9e6d3b73b513139e444fccfbf6fcc45b495df3a43b86369a7a0d4b83c37c98bcdcce1452bc82d956230836038c09f96ea6d2da2dbeac64abd9ace620eace771b +SHA512 (workrave-v1_10_50.tar.gz) = ccc985518aab06e31447ac9a16f4a39dfae077be581706b4ac88392e4d5e993f32b2bdc5697d7540785d5ebd6f1d31339d5dc1a5f7b6241da44a4e61cce021da diff --git a/workrave.spec b/workrave.spec index 1fd2d6a..d02f21f 100644 --- a/workrave.spec +++ b/workrave.spec @@ -1,16 +1,18 @@ -%global gnome_flashback 0 +%global gnome_flashback 1 %global mate 1 %global xfce 1 Name: workrave -Version: 1.10.49 -Release: 3%{?dist} +Version: 1.10.50 +Release: 1%{?dist} Summary: Program that assists in the recovery and prevention of RSI # Based on older packages by Dag Wieers and Steve Ratcliffe License: GPLv3+ URL: http://www.workrave.org/ %global tag %(echo %{version} | sed -e 's/\\./_/g') Source0: https://github.com/rcaelers/workrave/archive/v%{tag}/%{name}-v%{tag}.tar.gz +# Support GNOME Shell 43, backport of https://github.com/rcaelers/workrave/pull/430 +Patch0: 578180d0982dd8f0dbe72574ae4758e6903691bb.patch Obsoletes: %{name}-gtk2 < 1.10.37-1 Provides: %{name}-gtk2 = %{?epoch:%{epoch}:}%{version}-%{release} @@ -44,7 +46,7 @@ BuildRequires: intltool BuildRequires: autoconf, automake, libtool, autoconf-archive BuildRequires: desktop-file-utils %if 0%{?gnome_flashback} -BuildRequires: pkgconfig(libpanel-applet) +BuildRequires: pkgconfig(libgnome-panel) %endif %if 0%{?xfce} || 0%{?mate} BuildRequires: pkgconfig(gtk+-3.0) @@ -98,6 +100,7 @@ This package provides an applet for the Xfce panel. %prep %setup -q -n workrave-%{tag} +%patch0 -p1 touch ChangeLog # https://bugzilla.redhat.com/show_bug.cgi?id=304121 sed -i -e '/^DISTRIBUTION_HOME/s/\/$//' frontend/gtkmm/src/Makefile.* @@ -187,10 +190,7 @@ desktop-file-install \ %if 0%{?gnome_flashback} %files gnome-flashback -%{_libexecdir}/gnome-applets/workrave-applet -%{_datadir}/dbus-1/services/org.gnome.panel.applet.WorkraveAppletFactory.service -%{_datadir}/gnome-panel/5.0/applets/org.workrave.WorkraveApplet.panel-applet -%{_datadir}/gnome-panel/ui/workrave-gnome-applet-menu.xml +%{_libdir}/gnome-panel/modules/libworkrave-applet.so %endif %if 0%{?xfce} @@ -208,6 +208,11 @@ desktop-file-install \ %endif %changelog +* Fri Nov 04 2022 Yaakov Selkowitz - 1.10.50-1 +- Update to 1.10.50 +- Enable GNOME Flashback applet +- Support GNOME Shell 42 (#2132504) and 43 (#2132507) + * Sat Jul 23 2022 Fedora Release Engineering - 1.10.49-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild