From cd59fa810bc08db69706a44d40238debcbb2962c Mon Sep 17 00:00:00 2001 From: Tomas Mraz Date: Thu, 3 Feb 2011 17:16:11 +0100 Subject: [PATCH 01/90] - rebuilt with new gnome-panel --- workrave.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/workrave.spec b/workrave.spec index 8573b6f..33784f9 100644 --- a/workrave.spec +++ b/workrave.spec @@ -1,6 +1,6 @@ Name: workrave Version: 1.9.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Program that assists in the recovery and prevention of RSI # Based on older packages by Dag Wieers and Steve Ratcliffe License: GPLv2+ @@ -77,6 +77,9 @@ desktop-file-install --vendor fedora \ %{_datadir}/dbus-1/services/org.workrave.Workrave.service %changelog +* Thu Feb 3 2011 Tomas Mraz - 1.9.3-2 +- rebuilt with new gnome-panel + * Fri Dec 17 2010 Tomas Mraz - 1.9.3-1 - new upstream release with bug fixes and usability improvements From 3e1bc263c950d6e355b5dca3ab21b5f346d04cdd Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mon, 7 Feb 2011 21:06:33 -0600 Subject: [PATCH 02/90] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- workrave.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/workrave.spec b/workrave.spec index 33784f9..fbae8da 100644 --- a/workrave.spec +++ b/workrave.spec @@ -1,6 +1,6 @@ Name: workrave Version: 1.9.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Program that assists in the recovery and prevention of RSI # Based on older packages by Dag Wieers and Steve Ratcliffe License: GPLv2+ @@ -77,6 +77,9 @@ desktop-file-install --vendor fedora \ %{_datadir}/dbus-1/services/org.workrave.Workrave.service %changelog +* Mon Feb 07 2011 Fedora Release Engineering - 1.9.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Thu Feb 3 2011 Tomas Mraz - 1.9.3-2 - rebuilt with new gnome-panel From 725caeb8b2869dc21c846ccc7df8295a66a1fa83 Mon Sep 17 00:00:00 2001 From: Tomas Mraz Date: Thu, 10 Feb 2011 22:41:43 +0100 Subject: [PATCH 03/90] - due to changes in gnome applet API we have to build without gnome support --- workrave.spec | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/workrave.spec b/workrave.spec index fbae8da..ddcadb0 100644 --- a/workrave.spec +++ b/workrave.spec @@ -1,6 +1,6 @@ Name: workrave Version: 1.9.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Program that assists in the recovery and prevention of RSI # Based on older packages by Dag Wieers and Steve Ratcliffe License: GPLv2+ @@ -9,10 +9,10 @@ URL: http://www.workrave.org/ Source0: http://downloads.sourceforge.net/workrave/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: gtkmm24-devel +BuildRequires: gconfmm26-devel BuildRequires: gettext BuildRequires: gnet2-devel -BuildRequires: libgnomeuimm26-devel -BuildRequires: gnome-panel-devel BuildRequires: desktop-file-utils BuildRequires: libXmu-devel BuildRequires: libXt-devel @@ -40,7 +40,7 @@ if [ ! -x configure ]; then NOCONFIGURE=1 ./autogen.sh fi -%configure --enable-dbus --disable-xml +%configure --enable-dbus --disable-xml --disable-gnome %{__make} @@ -68,15 +68,15 @@ desktop-file-install --vendor fedora \ %{_bindir}/* %{_datadir}/workrave/ %{_datadir}/sounds/workrave -%{_sysconfdir}/sound/events/workrave.soundlist -%{_libdir}/bonobo/servers/Workrave-Applet.server -%{_libexecdir}/workrave-applet -%{_datadir}/gnome-2.0/ui/GNOME_WorkraveApplet.xml %{_datadir}/pixmaps/workrave %{_datadir}/applications/fedora-workrave.desktop %{_datadir}/dbus-1/services/org.workrave.Workrave.service %changelog +* Thu Feb 10 2011 Tomas Mraz - 1.9.3-4 +- due to changes in gnome applet API we have to build without + gnome support + * Mon Feb 07 2011 Fedora Release Engineering - 1.9.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From 13b53c14c98c58f77845f6c400cd9bd1541f5821 Mon Sep 17 00:00:00 2001 From: Rahul Sundaram Date: Wed, 6 Apr 2011 15:19:44 +0530 Subject: [PATCH 04/90] New upstream bug fix release. Closes rhbz#693958 https://github.com/rcaelers/workrave/blob/b491d9b5054b5571d5b4ff0f6c9137133735129d/NEWS Drop buildroot definition and clean section --- sources | 2 +- workrave.spec | 17 ++++++++++------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/sources b/sources index 6bc6619..ffe08c2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d1992f54750f3241797aa809de5a0753 workrave-1.9.3.tar.gz +d5eaf399b38b063053cff1a8527cba8e workrave-1.9.4.tar.gz diff --git a/workrave.spec b/workrave.spec index ddcadb0..db64ec6 100644 --- a/workrave.spec +++ b/workrave.spec @@ -1,6 +1,6 @@ Name: workrave -Version: 1.9.3 -Release: 4%{?dist} +Version: 1.9.4 +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: GPLv2+ @@ -8,7 +8,6 @@ Group: Applications/Productivity URL: http://www.workrave.org/ Source0: http://downloads.sourceforge.net/workrave/%{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtkmm24-devel BuildRequires: gconfmm26-devel BuildRequires: gettext @@ -59,20 +58,24 @@ desktop-file-install --vendor fedora \ $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop -%clean -%{__rm} -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-,root,root) %doc AUTHORS COPYING NEWS README %{_bindir}/* %{_datadir}/workrave/ -%{_datadir}/sounds/workrave -%{_datadir}/pixmaps/workrave +%{_datadir}/sounds/workrave/ +%{_datadir}/icons/hicolor/48x48/apps/workrave-icon-huge.png +%{_datadir}/icons/hicolor/scalable/apps/workrave-sheep.svg %{_datadir}/applications/fedora-workrave.desktop %{_datadir}/dbus-1/services/org.workrave.Workrave.service %changelog +* Wed Apr 06 2011 Rahul Sundaram - 1.9.4-1 +- New upstream bug fix release. Closes rhbz#693958 +- https://github.com/rcaelers/workrave/blob/b491d9b5054b5571d5b4ff0f6c9137133735129d/NEWS +- Drop buildroot definition and clean section + * Thu Feb 10 2011 Tomas Mraz - 1.9.3-4 - due to changes in gnome applet API we have to build without gnome support From 79c4c88a516a3bf57211dd6767c0820766353d56 Mon Sep 17 00:00:00 2001 From: Tomas Mraz Date: Tue, 28 Jun 2011 21:27:16 +0200 Subject: [PATCH 05/90] no longer needs gnet2 --- workrave.spec | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/workrave.spec b/workrave.spec index db64ec6..4adf119 100644 --- a/workrave.spec +++ b/workrave.spec @@ -1,6 +1,6 @@ Name: workrave Version: 1.9.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Program that assists in the recovery and prevention of RSI # Based on older packages by Dag Wieers and Steve Ratcliffe License: GPLv2+ @@ -9,9 +9,8 @@ URL: http://www.workrave.org/ Source0: http://downloads.sourceforge.net/workrave/%{name}-%{version}.tar.gz BuildRequires: gtkmm24-devel -BuildRequires: gconfmm26-devel +BuildRequires: GConf2-devel BuildRequires: gettext -BuildRequires: gnet2-devel BuildRequires: desktop-file-utils BuildRequires: libXmu-devel BuildRequires: libXt-devel @@ -39,7 +38,7 @@ if [ ! -x configure ]; then NOCONFIGURE=1 ./autogen.sh fi -%configure --enable-dbus --disable-xml --disable-gnome +%configure --enable-dbus --disable-xml %{__make} @@ -71,6 +70,9 @@ desktop-file-install --vendor fedora \ %{_datadir}/dbus-1/services/org.workrave.Workrave.service %changelog +* Tue Jun 28 2011 Tomas Mraz - 1.9.4-2 +- no longer needs gnet2 + * Wed Apr 06 2011 Rahul Sundaram - 1.9.4-1 - New upstream bug fix release. Closes rhbz#693958 - https://github.com/rcaelers/workrave/blob/b491d9b5054b5571d5b4ff0f6c9137133735129d/NEWS From 072ecede8f97ce1967a89a4659bfa9e5f488ebfb Mon Sep 17 00:00:00 2001 From: Tomas Mraz Date: Mon, 7 Nov 2011 08:54:57 +0100 Subject: [PATCH 06/90] rebuilt with new libpng --- workrave.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/workrave.spec b/workrave.spec index 4adf119..7b11190 100644 --- a/workrave.spec +++ b/workrave.spec @@ -1,6 +1,6 @@ Name: workrave Version: 1.9.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Program that assists in the recovery and prevention of RSI # Based on older packages by Dag Wieers and Steve Ratcliffe License: GPLv2+ @@ -70,6 +70,9 @@ desktop-file-install --vendor fedora \ %{_datadir}/dbus-1/services/org.workrave.Workrave.service %changelog +* Mon Nov 7 2011 Tomas Mraz - 1.9.4-3 +- rebuilt with new libpng + * Tue Jun 28 2011 Tomas Mraz - 1.9.4-2 - no longer needs gnet2 From d1167909c440cf05bbc7e8019d28ccbed99eed65 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 14 Jan 2012 02:28:40 -0600 Subject: [PATCH 07/90] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- workrave.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/workrave.spec b/workrave.spec index 7b11190..583f75a 100644 --- a/workrave.spec +++ b/workrave.spec @@ -1,6 +1,6 @@ Name: workrave Version: 1.9.4 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Program that assists in the recovery and prevention of RSI # Based on older packages by Dag Wieers and Steve Ratcliffe License: GPLv2+ @@ -70,6 +70,9 @@ desktop-file-install --vendor fedora \ %{_datadir}/dbus-1/services/org.workrave.Workrave.service %changelog +* Sat Jan 14 2012 Fedora Release Engineering - 1.9.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Mon Nov 7 2011 Tomas Mraz - 1.9.4-3 - rebuilt with new libpng From c3c0163bd8ef2fc9279dbbf252ccb37592015dc3 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 28 Feb 2012 14:34:48 -0600 Subject: [PATCH 08/90] - Rebuilt for c++ ABI breakage --- workrave.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/workrave.spec b/workrave.spec index 583f75a..f2a6576 100644 --- a/workrave.spec +++ b/workrave.spec @@ -1,6 +1,6 @@ Name: workrave Version: 1.9.4 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Program that assists in the recovery and prevention of RSI # Based on older packages by Dag Wieers and Steve Ratcliffe License: GPLv2+ @@ -70,6 +70,9 @@ desktop-file-install --vendor fedora \ %{_datadir}/dbus-1/services/org.workrave.Workrave.service %changelog +* Tue Feb 28 2012 Fedora Release Engineering - 1.9.4-5 +- Rebuilt for c++ ABI breakage + * Sat Jan 14 2012 Fedora Release Engineering - 1.9.4-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From c7da395aeb917f3b480f400c6468f831d42888c2 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 21 Jul 2012 22:59:38 -0500 Subject: [PATCH 09/90] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- workrave.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/workrave.spec b/workrave.spec index f2a6576..cc1dd77 100644 --- a/workrave.spec +++ b/workrave.spec @@ -1,6 +1,6 @@ Name: workrave Version: 1.9.4 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Program that assists in the recovery and prevention of RSI # Based on older packages by Dag Wieers and Steve Ratcliffe License: GPLv2+ @@ -70,6 +70,9 @@ desktop-file-install --vendor fedora \ %{_datadir}/dbus-1/services/org.workrave.Workrave.service %changelog +* Sun Jul 22 2012 Fedora Release Engineering - 1.9.4-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Tue Feb 28 2012 Fedora Release Engineering - 1.9.4-5 - Rebuilt for c++ ABI breakage From bc85e93df1949846376c83b14e4835c87fb98ee1 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Tue, 8 Jan 2013 11:05:11 -0500 Subject: [PATCH 10/90] update to 1.9.911 checkout from github, build for gnome 3 --- .gitignore | 1 + sources | 2 +- workrave-6f9bc5d-fix-configure.patch | 12 +++ ...rave-6f9bc5d-fix-desktop-translation.patch | 26 +++++++ workrave.spec | 77 +++++++++++++++---- 5 files changed, 100 insertions(+), 18 deletions(-) create mode 100644 workrave-6f9bc5d-fix-configure.patch create mode 100644 workrave-6f9bc5d-fix-desktop-translation.patch diff --git a/.gitignore b/.gitignore index 3a280a1..40160da 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ workrave-1.9.1.tar.gz /workrave-1.9.2.tar.gz /workrave-1.9.3.tar.gz +/workrave-1.9.911-6f9bc5d.tar.gz diff --git a/sources b/sources index ffe08c2..84bfaa8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d5eaf399b38b063053cff1a8527cba8e workrave-1.9.4.tar.gz +06ebeac26d44672d21ff9534b910c3d4 workrave-1.9.911-6f9bc5d.tar.gz diff --git a/workrave-6f9bc5d-fix-configure.patch b/workrave-6f9bc5d-fix-configure.patch new file mode 100644 index 0000000..2c5a4f5 --- /dev/null +++ b/workrave-6f9bc5d-fix-configure.patch @@ -0,0 +1,12 @@ +diff -up workrave-6f9bc5d9d66c6042923ca39367f54db39ecd914a/configure.ac.fix workrave-6f9bc5d9d66c6042923ca39367f54db39ecd914a/configure.ac +--- workrave-6f9bc5d9d66c6042923ca39367f54db39ecd914a/configure.ac.fix 2013-01-07 12:13:06.000000000 -0500 ++++ workrave-6f9bc5d9d66c6042923ca39367f54db39ecd914a/configure.ac 2013-01-08 10:05:16.474764630 -0500 +@@ -23,7 +23,7 @@ AC_CONFIG_SRCDIR([backend/include/ICore. + AC_CONFIG_MACRO_DIR([m4]) + AC_CONFIG_HEADER([config.h]) + +-AM_INIT_AUTOMAKE([-Wall -Werror foreign silent-rules]) ++AM_INIT_AUTOMAKE([-Wall -Wno-portability]) + dnl AM_SILENT_RULES([yes]) + + GNOME_SHELL_VERSION=3.6.2 diff --git a/workrave-6f9bc5d-fix-desktop-translation.patch b/workrave-6f9bc5d-fix-desktop-translation.patch new file mode 100644 index 0000000..228be2d --- /dev/null +++ b/workrave-6f9bc5d-fix-desktop-translation.patch @@ -0,0 +1,26 @@ +diff -up workrave-6f9bc5d9d66c6042923ca39367f54db39ecd914a/po/pl.po.fixtrans workrave-6f9bc5d9d66c6042923ca39367f54db39ecd914a/po/pl.po +--- workrave-6f9bc5d9d66c6042923ca39367f54db39ecd914a/po/pl.po.fixtrans 2013-01-08 10:35:25.349987436 -0500 ++++ workrave-6f9bc5d9d66c6042923ca39367f54db39ecd914a/po/pl.po 2013-01-08 10:35:40.498995191 -0500 +@@ -904,8 +904,7 @@ msgstr "Opóźnienie trwa:" + msgid "" + "Assists in the prevention and recovery of Repetitive Strain Injury (RSI)" + msgstr "" +-"Pomaga w zapobieganiu urazom na skutek chronicznego przeciążenia\n" +-"- RSI (Repetitive Strain Injury) oraz wspomaga rekonwalescencję" ++"Pomaga w zapobieganiu urazom na skutek chronicznego przeciążenia - RSI (Repetitive Strain Injury) oraz wspomaga rekonwalescencję" + + #: ../frontend/plugin/distribution/gtkmm/src/NetworkJoinDialog.cc:55 + #: ../frontend/plugin/distribution/gtkmm/src/NetworkJoinDialog.cc:79 +diff -up workrave-6f9bc5d9d66c6042923ca39367f54db39ecd914a/po/ru.po.fixtrans workrave-6f9bc5d9d66c6042923ca39367f54db39ecd914a/po/ru.po +--- workrave-6f9bc5d9d66c6042923ca39367f54db39ecd914a/po/ru.po.fixtrans 2013-01-08 10:35:05.755978135 -0500 ++++ workrave-6f9bc5d9d66c6042923ca39367f54db39ecd914a/po/ru.po 2013-01-08 10:35:16.631982923 -0500 +@@ -760,8 +760,7 @@ msgstr "Расположение в си + msgid "" + "Assists in the prevention and recovery of Repetitive Strain Injury (RSI)" + msgstr "" +-"Эта программа помогает в предупреждении и лечении туннельного синдрома\n " +-"запястья и снятии общего мышечного напряжения." ++"Эта программа помогает в предупреждении и лечении туннельного синдрома запястья и снятии общего мышечного напряжения." + + #: ../frontend/gtkmm/src/gnome_applet/GNOME_WorkraveApplet.xml.in.h:1 + #: ../frontend/gtkmm/src/gnome_applet3/WorkraveApplet.c:874 diff --git a/workrave.spec b/workrave.spec index cc1dd77..660e56c 100644 --- a/workrave.spec +++ b/workrave.spec @@ -1,22 +1,35 @@ +%global commit 6f9bc5d9d66c6042923ca39367f54db39ecd914a +%global shortcommit %(c=%{commit}; echo ${c:0:7}) +%global commitdate 20130107 + Name: workrave -Version: 1.9.4 -Release: 6%{?dist} +Version: 1.9.911 +Release: 0.1.%{commitdate}git%{shortcommit}%{?dist} Summary: Program that assists in the recovery and prevention of RSI # Based on older packages by Dag Wieers and Steve Ratcliffe License: GPLv2+ Group: Applications/Productivity URL: http://www.workrave.org/ -Source0: http://downloads.sourceforge.net/workrave/%{name}-%{version}.tar.gz +# Using github checkout: +# https://github.com/rcaelers/workrave +# Source0: http://downloads.sourceforge.net/workrave/%{name}-%{version}.tar.gz +Source0: https://github.com/rcaelers/workrave/archive/%{commit}/%{name}-%{version}-%{shortcommit}.tar.gz +Patch0: workrave-6f9bc5d-fix-configure.patch +Patch1: workrave-6f9bc5d-fix-desktop-translation.patch -BuildRequires: gtkmm24-devel -BuildRequires: GConf2-devel +BuildRequires: gnome-panel-devel +BuildRequires: glib2-devel >= 2.28.0 +BuildRequires: gtk3-devel >= 3.0.0 +BuildRequires: libsigc++20-devel >= 2.2.4.2 +BuildRequires: glibmm24-devel >= 2.28.0 +BuildRequires: gtkmm30-devel >= 3.0.0 +# BuildRequires: GConf2-devel BuildRequires: gettext BuildRequires: desktop-file-utils BuildRequires: libXmu-devel BuildRequires: libXt-devel BuildRequires: libXtst-devel BuildRequires: dbus-devel -BuildRequires: dbus-glib-devel BuildRequires: gstreamer-devel BuildRequires: intltool BuildRequires: python-cheetah @@ -29,8 +42,18 @@ Workrave is a program that assists in the recovery and prevention of Repetitive Strain Injury (RSI). The program frequently alerts you to take micro-pauses, rest breaks and restricts you to your daily limit. +%package devel +Requires: %{name} = %{version}-%{release} +Summary: Development files for workrave + +%description devel +Development files for workrave. + %prep -%setup -q -n %{name}-%{version} +%setup -q -n %{name}-%{commit} +%patch0 -p1 -b .fix +%patch1 -p1 -b .fixpl +touch ChangeLog %build if [ ! -x configure ]; then @@ -38,38 +61,58 @@ if [ ! -x configure ]; then NOCONFIGURE=1 ./autogen.sh fi -%configure --enable-dbus --disable-xml +%configure --enable-dbus --disable-xml --enable-gnome3 --disable-static %{__make} %install -%{__rm} -rf $RPM_BUILD_ROOT +make install DESTDIR=%{buildroot} -make install DESTDIR=$RPM_BUILD_ROOT +rm -rf %{buildroot}%{_libdir}/*.la %{buildroot}%{_libdir}/*.a %find_lang %{name} desktop-file-install --vendor fedora \ - --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ + --dir %{buildroot}%{_datadir}/applications \ --add-category X-Fedora \ --remove-category GTK \ --delete-original \ - $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop - - + %{buildroot}%{_datadir}/applications/%{name}.desktop %files -f %{name}.lang -%defattr(-,root,root) %doc AUTHORS COPYING NEWS README %{_bindir}/* %{_datadir}/workrave/ %{_datadir}/sounds/workrave/ -%{_datadir}/icons/hicolor/48x48/apps/workrave-icon-huge.png -%{_datadir}/icons/hicolor/scalable/apps/workrave-sheep.svg +%{_datadir}/icons/hicolor/16x16/apps/workrave.png +%{_datadir}/icons/hicolor/24x24/apps/workrave.png +%{_datadir}/icons/hicolor/32x32/apps/workrave.png +%{_datadir}/icons/hicolor/48x48/apps/workrave.png +%{_datadir}/icons/hicolor/64x64/apps/workrave.png +%{_datadir}/icons/hicolor/96x96/apps/workrave.png +%{_datadir}/icons/hicolor/128x128/apps/workrave.png +%{_datadir}/icons/hicolor/scalable/workrave-sheep.svg +%{_datadir}/icons/hicolor/scalable/apps/workrave.svg %{_datadir}/applications/fedora-workrave.desktop %{_datadir}/dbus-1/services/org.workrave.Workrave.service +%{_datadir}/dbus-1/services/org.gnome.panel.applet.WorkraveAppletFactory.service +%{_datadir}/glib-2.0/schemas/org.workrave.*.xml +%{_datadir}/gnome-panel/4.0/applets/org.workrave.WorkraveApplet.panel-applet +%{_datadir}/gnome-panel/ui/workrave-gnome-applet-menu.xml +%{_datadir}/gnome-shell/extensions/workrave@workrave.org/ +%{_libdir}/girepository-1.0/Workrave-1.0.typelib +%{_libexecdir}/workrave-applet +%{_libdir}/libworkrave-private-1.0.so.* + +%files devel +%{_datadir}/gir-1.0/Workrave-1.0.gir +%{_libdir}/libworkrave-private-1.0.so %changelog +* Tue Jan 8 2013 Tom Callaway - 1.9.911-0.1.20130107git6f9bc5d +- update to 1.9.911 checkout from github +- build for gnome3 + * Sun Jul 22 2012 Fedora Release Engineering - 1.9.4-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From cd85f7002a0d7b554ac1d63f7aff16eac0f1c1e5 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Tue, 8 Jan 2013 12:05:15 -0500 Subject: [PATCH 11/90] add missing br --- workrave.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/workrave.spec b/workrave.spec index 660e56c..5e11a3b 100644 --- a/workrave.spec +++ b/workrave.spec @@ -34,6 +34,7 @@ BuildRequires: gstreamer-devel BuildRequires: intltool BuildRequires: python-cheetah BuildRequires: pulseaudio-libs-devel +BuildRequires: autoconf, automake, libtool Requires: dbus From fdbc3648b6b116d0994ac0b280d5da3a1b920258 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Tue, 8 Jan 2013 12:42:33 -0500 Subject: [PATCH 12/90] add missing br --- workrave.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workrave.spec b/workrave.spec index 5e11a3b..381bacd 100644 --- a/workrave.spec +++ b/workrave.spec @@ -23,7 +23,7 @@ BuildRequires: gtk3-devel >= 3.0.0 BuildRequires: libsigc++20-devel >= 2.2.4.2 BuildRequires: glibmm24-devel >= 2.28.0 BuildRequires: gtkmm30-devel >= 3.0.0 -# BuildRequires: GConf2-devel +BuildRequires: gobject-introspection-devel BuildRequires: gettext BuildRequires: desktop-file-utils BuildRequires: libXmu-devel From aa6f9ff88da4f9b024d24cff5ab499ad3c017761 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Tue, 8 Jan 2013 14:38:57 -0500 Subject: [PATCH 13/90] add missing br --- workrave.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/workrave.spec b/workrave.spec index 381bacd..ad06007 100644 --- a/workrave.spec +++ b/workrave.spec @@ -29,6 +29,7 @@ BuildRequires: desktop-file-utils BuildRequires: libXmu-devel BuildRequires: libXt-devel BuildRequires: libXtst-devel +BuildRequires: libXScrnSaver-devel BuildRequires: dbus-devel BuildRequires: gstreamer-devel BuildRequires: intltool @@ -159,7 +160,7 @@ desktop-file-install --vendor fedora \ * Thu Jan 28 2010 Tomas Mraz - 1.9.1-2 - do not build against gdome2 - not too useful optional feature -* Tue Dec 9 2009 Tomas Mraz - 1.9.1-1 +* Tue Dec 8 2009 Tomas Mraz - 1.9.1-1 - new upstream version * Mon Jul 27 2009 Fedora Release Engineering - 1.9.0-4 From f7adac29c014546985eba96174d9b04faba426e0 Mon Sep 17 00:00:00 2001 From: Tomas Mraz Date: Fri, 8 Feb 2013 18:44:20 +0100 Subject: [PATCH 14/90] drop --vendor from desktop-file-install call --- workrave.spec | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/workrave.spec b/workrave.spec index ad06007..d57708b 100644 --- a/workrave.spec +++ b/workrave.spec @@ -4,7 +4,7 @@ Name: workrave Version: 1.9.911 -Release: 0.1.%{commitdate}git%{shortcommit}%{?dist} +Release: 0.2.%{commitdate}git%{shortcommit}%{?dist} Summary: Program that assists in the recovery and prevention of RSI # Based on older packages by Dag Wieers and Steve Ratcliffe License: GPLv2+ @@ -74,11 +74,9 @@ rm -rf %{buildroot}%{_libdir}/*.la %{buildroot}%{_libdir}/*.a %find_lang %{name} -desktop-file-install --vendor fedora \ - --dir %{buildroot}%{_datadir}/applications \ - --add-category X-Fedora \ - --remove-category GTK \ - --delete-original \ +desktop-file-install \ + --dir %{buildroot}%{_datadir}/applications \ + --delete-original \ %{buildroot}%{_datadir}/applications/%{name}.desktop %files -f %{name}.lang @@ -111,6 +109,9 @@ desktop-file-install --vendor fedora \ %{_libdir}/libworkrave-private-1.0.so %changelog +* Fri Feb 8 2013 Tomáš Mráz - 1.9.911-0.2.20130107git6f9bc5d +- drop --vendor from desktop-file-install call + * Tue Jan 8 2013 Tom Callaway - 1.9.911-0.1.20130107git6f9bc5d - update to 1.9.911 checkout from github - build for gnome3 From 66f62ddd7e0ad3bb7014f7cc30c6a0db9d73543c Mon Sep 17 00:00:00 2001 From: Toshio Kuratomi Date: Fri, 15 Feb 2013 12:44:15 -0800 Subject: [PATCH 15/90] Remove fedora- prefix from desktop file in %files too --- workrave.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workrave.spec b/workrave.spec index d57708b..1959043 100644 --- a/workrave.spec +++ b/workrave.spec @@ -93,7 +93,7 @@ desktop-file-install \ %{_datadir}/icons/hicolor/128x128/apps/workrave.png %{_datadir}/icons/hicolor/scalable/workrave-sheep.svg %{_datadir}/icons/hicolor/scalable/apps/workrave.svg -%{_datadir}/applications/fedora-workrave.desktop +%{_datadir}/applications/workrave.desktop %{_datadir}/dbus-1/services/org.workrave.Workrave.service %{_datadir}/dbus-1/services/org.gnome.panel.applet.WorkraveAppletFactory.service %{_datadir}/glib-2.0/schemas/org.workrave.*.xml From c70222b172d06ada61fb2b5f72f2e39ebf001654 Mon Sep 17 00:00:00 2001 From: Tomas Mraz Date: Tue, 19 Feb 2013 20:54:17 +0100 Subject: [PATCH 16/90] new upstream release --- workrave-6f9bc5d-fix-configure.patch | 12 ------ workrave.spec | 63 +++++++++++++--------------- 2 files changed, 30 insertions(+), 45 deletions(-) delete mode 100644 workrave-6f9bc5d-fix-configure.patch diff --git a/workrave-6f9bc5d-fix-configure.patch b/workrave-6f9bc5d-fix-configure.patch deleted file mode 100644 index 2c5a4f5..0000000 --- a/workrave-6f9bc5d-fix-configure.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up workrave-6f9bc5d9d66c6042923ca39367f54db39ecd914a/configure.ac.fix workrave-6f9bc5d9d66c6042923ca39367f54db39ecd914a/configure.ac ---- workrave-6f9bc5d9d66c6042923ca39367f54db39ecd914a/configure.ac.fix 2013-01-07 12:13:06.000000000 -0500 -+++ workrave-6f9bc5d9d66c6042923ca39367f54db39ecd914a/configure.ac 2013-01-08 10:05:16.474764630 -0500 -@@ -23,7 +23,7 @@ AC_CONFIG_SRCDIR([backend/include/ICore. - AC_CONFIG_MACRO_DIR([m4]) - AC_CONFIG_HEADER([config.h]) - --AM_INIT_AUTOMAKE([-Wall -Werror foreign silent-rules]) -+AM_INIT_AUTOMAKE([-Wall -Wno-portability]) - dnl AM_SILENT_RULES([yes]) - - GNOME_SHELL_VERSION=3.6.2 diff --git a/workrave.spec b/workrave.spec index 1959043..97dc165 100644 --- a/workrave.spec +++ b/workrave.spec @@ -1,41 +1,36 @@ -%global commit 6f9bc5d9d66c6042923ca39367f54db39ecd914a -%global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commitdate 20130107 - Name: workrave -Version: 1.9.911 -Release: 0.2.%{commitdate}git%{shortcommit}%{?dist} +Version: 1.10 +Release: 1 Summary: Program that assists in the recovery and prevention of RSI # Based on older packages by Dag Wieers and Steve Ratcliffe -License: GPLv2+ +License: GPLv3+ Group: Applications/Productivity URL: http://www.workrave.org/ # Using github checkout: # https://github.com/rcaelers/workrave # Source0: http://downloads.sourceforge.net/workrave/%{name}-%{version}.tar.gz -Source0: https://github.com/rcaelers/workrave/archive/%{commit}/%{name}-%{version}-%{shortcommit}.tar.gz -Patch0: workrave-6f9bc5d-fix-configure.patch +Source0: https://github.com/rcaelers/workrave/archive/%{commit}/%{name}-%{version}.tar.gz Patch1: workrave-6f9bc5d-fix-desktop-translation.patch -BuildRequires: gnome-panel-devel -BuildRequires: glib2-devel >= 2.28.0 -BuildRequires: gtk3-devel >= 3.0.0 -BuildRequires: libsigc++20-devel >= 2.2.4.2 -BuildRequires: glibmm24-devel >= 2.28.0 -BuildRequires: gtkmm30-devel >= 3.0.0 -BuildRequires: gobject-introspection-devel -BuildRequires: gettext -BuildRequires: desktop-file-utils -BuildRequires: libXmu-devel -BuildRequires: libXt-devel -BuildRequires: libXtst-devel -BuildRequires: libXScrnSaver-devel -BuildRequires: dbus-devel -BuildRequires: gstreamer-devel -BuildRequires: intltool -BuildRequires: python-cheetah -BuildRequires: pulseaudio-libs-devel -BuildRequires: autoconf, automake, libtool +BuildRequires: gnome-panel-devel +BuildRequires: glib2-devel >= 2.28.0 +BuildRequires: gtk3-devel >= 3.0.0 +BuildRequires: libsigc++20-devel >= 2.2.4.2 +BuildRequires: glibmm24-devel >= 2.28.0 +BuildRequires: gtkmm30-devel >= 3.0.0 +BuildRequires: gobject-introspection-devel +BuildRequires: gettext +BuildRequires: desktop-file-utils +BuildRequires: libXmu-devel +BuildRequires: libXt-devel +BuildRequires: libXtst-devel +BuildRequires: libXScrnSaver-devel +BuildRequires: dbus-devel +BuildRequires: gstreamer-devel +BuildRequires: intltool +BuildRequires: python-cheetah +BuildRequires: pulseaudio-libs-devel +BuildRequires: autoconf, automake, libtool Requires: dbus @@ -45,15 +40,14 @@ Repetitive Strain Injury (RSI). The program frequently alerts you to take micro-pauses, rest breaks and restricts you to your daily limit. %package devel -Requires: %{name} = %{version}-%{release} -Summary: Development files for workrave +Requires: %{name} = %{version}-%{release} +Summary: Development files for workrave %description devel Development files for workrave. %prep -%setup -q -n %{name}-%{commit} -%patch0 -p1 -b .fix +%setup -q %patch1 -p1 -b .fixpl touch ChangeLog @@ -65,7 +59,7 @@ fi %configure --enable-dbus --disable-xml --enable-gnome3 --disable-static -%{__make} +%{__make} V=1 %install make install DESTDIR=%{buildroot} @@ -109,6 +103,9 @@ desktop-file-install \ %{_libdir}/libworkrave-private-1.0.so %changelog +* Tue Feb 19 2013 Tomáš Mráz - 1.10-1 +- new upstream release + * Fri Feb 8 2013 Tomáš Mráz - 1.9.911-0.2.20130107git6f9bc5d - drop --vendor from desktop-file-install call From 87f1be85dccee35ebcff2a3ef1298307e09493bd Mon Sep 17 00:00:00 2001 From: Tomas Mraz Date: Tue, 19 Feb 2013 21:02:21 +0100 Subject: [PATCH 17/90] New sources uploaded. --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 40160da..4240c49 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ workrave-1.9.1.tar.gz /workrave-1.9.2.tar.gz /workrave-1.9.3.tar.gz /workrave-1.9.911-6f9bc5d.tar.gz +/workrave-1.10.tar.gz diff --git a/sources b/sources index 84bfaa8..3995c57 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -06ebeac26d44672d21ff9534b910c3d4 workrave-1.9.911-6f9bc5d.tar.gz +5b76c2ef8e1dfede69c4e0d4bca9dcb9 workrave-1.10.tar.gz From 829b6d0d9e44fa197ead83633b6e0a4b9a7e4a20 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 25 Mar 2013 13:57:54 +0000 Subject: [PATCH 18/90] Add missing distag --- workrave.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/workrave.spec b/workrave.spec index 97dc165..8455b49 100644 --- a/workrave.spec +++ b/workrave.spec @@ -1,6 +1,6 @@ Name: workrave Version: 1.10 -Release: 1 +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+ @@ -59,7 +59,7 @@ fi %configure --enable-dbus --disable-xml --enable-gnome3 --disable-static -%{__make} V=1 +make V=1 %install make install DESTDIR=%{buildroot} @@ -103,6 +103,9 @@ desktop-file-install \ %{_libdir}/libworkrave-private-1.0.so %changelog +* Mon Mar 25 2013 Peter Robinson 1.10-2 +- Add missing distag + * Tue Feb 19 2013 Tomáš Mráz - 1.10-1 - new upstream release From 2ac60eadf428e1e9319264413e9037c051c5c2ec Mon Sep 17 00:00:00 2001 From: Tomas Mraz Date: Fri, 3 May 2013 17:47:16 +0200 Subject: [PATCH 19/90] do not build the panel applet --- workrave.spec | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/workrave.spec b/workrave.spec index 8455b49..c099978 100644 --- a/workrave.spec +++ b/workrave.spec @@ -1,6 +1,6 @@ Name: workrave Version: 1.10 -Release: 1%{?dist} +Release: 3%{?dist} Summary: Program that assists in the recovery and prevention of RSI # Based on older packages by Dag Wieers and Steve Ratcliffe License: GPLv3+ @@ -12,7 +12,6 @@ URL: http://www.workrave.org/ Source0: https://github.com/rcaelers/workrave/archive/%{commit}/%{name}-%{version}.tar.gz Patch1: workrave-6f9bc5d-fix-desktop-translation.patch -BuildRequires: gnome-panel-devel BuildRequires: glib2-devel >= 2.28.0 BuildRequires: gtk3-devel >= 3.0.0 BuildRequires: libsigc++20-devel >= 2.2.4.2 @@ -25,7 +24,8 @@ BuildRequires: libXmu-devel BuildRequires: libXt-devel BuildRequires: libXtst-devel BuildRequires: libXScrnSaver-devel -BuildRequires: dbus-devel +# Temporarily disabled because not usable without panel +#BuildRequires: dbus-devel BuildRequires: gstreamer-devel BuildRequires: intltool BuildRequires: python-cheetah @@ -57,7 +57,7 @@ if [ ! -x configure ]; then NOCONFIGURE=1 ./autogen.sh fi -%configure --enable-dbus --disable-xml --enable-gnome3 --disable-static +%configure --disable-dbus --disable-xml --enable-gnome3 --disable-static make V=1 @@ -88,14 +88,14 @@ desktop-file-install \ %{_datadir}/icons/hicolor/scalable/workrave-sheep.svg %{_datadir}/icons/hicolor/scalable/apps/workrave.svg %{_datadir}/applications/workrave.desktop -%{_datadir}/dbus-1/services/org.workrave.Workrave.service -%{_datadir}/dbus-1/services/org.gnome.panel.applet.WorkraveAppletFactory.service -%{_datadir}/glib-2.0/schemas/org.workrave.*.xml -%{_datadir}/gnome-panel/4.0/applets/org.workrave.WorkraveApplet.panel-applet -%{_datadir}/gnome-panel/ui/workrave-gnome-applet-menu.xml +#%{_datadir}/dbus-1/services/org.workrave.Workrave.service +#%{_datadir}/dbus-1/services/org.gnome.panel.applet.WorkraveAppletFactory.service +#%{_datadir}/glib-2.0/schemas/org.workrave.*.xml +#%{_datadir}/gnome-panel/4.0/applets/org.workrave.WorkraveApplet.panel-applet +#%{_datadir}/gnome-panel/ui/workrave-gnome-applet-menu.xml %{_datadir}/gnome-shell/extensions/workrave@workrave.org/ %{_libdir}/girepository-1.0/Workrave-1.0.typelib -%{_libexecdir}/workrave-applet +#%{_libexecdir}/workrave-applet %{_libdir}/libworkrave-private-1.0.so.* %files devel @@ -103,6 +103,9 @@ desktop-file-install \ %{_libdir}/libworkrave-private-1.0.so %changelog +* Fri May 3 2013 Tomáš Mráz - 1.10-3 +- do not build the panel applet + * Mon Mar 25 2013 Peter Robinson 1.10-2 - Add missing distag From ef5767f8d19df17089ee0f43760188518de214f5 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 4 Aug 2013 02:14:07 -0500 Subject: [PATCH 20/90] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- workrave.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/workrave.spec b/workrave.spec index c099978..87b4590 100644 --- a/workrave.spec +++ b/workrave.spec @@ -1,6 +1,6 @@ Name: workrave Version: 1.10 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Program that assists in the recovery and prevention of RSI # Based on older packages by Dag Wieers and Steve Ratcliffe License: GPLv3+ @@ -103,6 +103,9 @@ desktop-file-install \ %{_libdir}/libworkrave-private-1.0.so %changelog +* Sun Aug 04 2013 Fedora Release Engineering - 1.10-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Fri May 3 2013 Tomáš Mráz - 1.10-3 - do not build the panel applet From 655a521b4326ead9d8cbdae9e3b2b39acfb3b10b Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 23:51:09 -0500 Subject: [PATCH 21/90] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- workrave.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/workrave.spec b/workrave.spec index 87b4590..957d957 100644 --- a/workrave.spec +++ b/workrave.spec @@ -1,6 +1,6 @@ Name: workrave Version: 1.10 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Program that assists in the recovery and prevention of RSI # Based on older packages by Dag Wieers and Steve Ratcliffe License: GPLv3+ @@ -103,6 +103,9 @@ desktop-file-install \ %{_libdir}/libworkrave-private-1.0.so %changelog +* Sun Jun 08 2014 Fedora Release Engineering - 1.10-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Sun Aug 04 2013 Fedora Release Engineering - 1.10-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From a0b1c079b48f73e04b22072d867ca25cc190bbfd Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Tue, 22 Jul 2014 20:40:13 +0200 Subject: [PATCH 22/90] Rebuilt for gobject-introspection 1.41.4 --- workrave.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/workrave.spec b/workrave.spec index 957d957..c129be5 100644 --- a/workrave.spec +++ b/workrave.spec @@ -1,6 +1,6 @@ Name: workrave Version: 1.10 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Program that assists in the recovery and prevention of RSI # Based on older packages by Dag Wieers and Steve Ratcliffe License: GPLv3+ @@ -103,6 +103,9 @@ desktop-file-install \ %{_libdir}/libworkrave-private-1.0.so %changelog +* Tue Jul 22 2014 Kalev Lember - 1.10-6 +- Rebuilt for gobject-introspection 1.41.4 + * Sun Jun 08 2014 Fedora Release Engineering - 1.10-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 5b49b5150b4b9c33c02e91675afdc68a3f7143b9 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 18 Aug 2014 08:53:56 +0000 Subject: [PATCH 23/90] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- workrave.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/workrave.spec b/workrave.spec index c129be5..55b80ce 100644 --- a/workrave.spec +++ b/workrave.spec @@ -1,6 +1,6 @@ Name: workrave Version: 1.10 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Program that assists in the recovery and prevention of RSI # Based on older packages by Dag Wieers and Steve Ratcliffe License: GPLv3+ @@ -103,6 +103,9 @@ desktop-file-install \ %{_libdir}/libworkrave-private-1.0.so %changelog +* Mon Aug 18 2014 Fedora Release Engineering - 1.10-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Tue Jul 22 2014 Kalev Lember - 1.10-6 - Rebuilt for gobject-introspection 1.41.4 From c4b9ae93ce6994060317570f6042baf035461da6 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Sat, 2 May 2015 18:36:59 +0200 Subject: [PATCH 24/90] Rebuilt for GCC 5 C++11 ABI change --- workrave.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/workrave.spec b/workrave.spec index 55b80ce..62d7490 100644 --- a/workrave.spec +++ b/workrave.spec @@ -1,6 +1,6 @@ Name: workrave Version: 1.10 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Program that assists in the recovery and prevention of RSI # Based on older packages by Dag Wieers and Steve Ratcliffe License: GPLv3+ @@ -103,6 +103,9 @@ desktop-file-install \ %{_libdir}/libworkrave-private-1.0.so %changelog +* Sat May 02 2015 Kalev Lember - 1.10-8 +- Rebuilt for GCC 5 C++11 ABI change + * Mon Aug 18 2014 Fedora Release Engineering - 1.10-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From 1797e734b6378aeebf6b692a52bdba806d8f4958 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 19 Jun 2015 02:34:21 +0000 Subject: [PATCH 25/90] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- workrave.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/workrave.spec b/workrave.spec index 62d7490..e38d69c 100644 --- a/workrave.spec +++ b/workrave.spec @@ -1,6 +1,6 @@ Name: workrave Version: 1.10 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Program that assists in the recovery and prevention of RSI # Based on older packages by Dag Wieers and Steve Ratcliffe License: GPLv3+ @@ -103,6 +103,9 @@ desktop-file-install \ %{_libdir}/libworkrave-private-1.0.so %changelog +* Fri Jun 19 2015 Fedora Release Engineering - 1.10-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Sat May 02 2015 Kalev Lember - 1.10-8 - Rebuilt for GCC 5 C++11 ABI change From 75baa97946731b6e029e7da5aa831184b3a45caf Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 5 Feb 2016 03:08:41 +0000 Subject: [PATCH 26/90] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- workrave.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/workrave.spec b/workrave.spec index e38d69c..669e53a 100644 --- a/workrave.spec +++ b/workrave.spec @@ -1,6 +1,6 @@ Name: workrave Version: 1.10 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Program that assists in the recovery and prevention of RSI # Based on older packages by Dag Wieers and Steve Ratcliffe License: GPLv3+ @@ -103,6 +103,9 @@ desktop-file-install \ %{_libdir}/libworkrave-private-1.0.so %changelog +* Fri Feb 05 2016 Fedora Release Engineering - 1.10-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Fri Jun 19 2015 Fedora Release Engineering - 1.10-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From 85113ed4eddf49d269a990dd319ceb002fa5f63e Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Fri, 26 Feb 2016 14:11:40 -0600 Subject: [PATCH 27/90] workrave 1.10.10 --- .gitignore | 1 + sources | 2 +- workrave-1.10.10-fix-translations.patch | 11 + ...rave-6f9bc5d-fix-desktop-translation.patch | 26 --- workrave.spec | 198 ++++++++++++++---- 5 files changed, 169 insertions(+), 69 deletions(-) create mode 100644 workrave-1.10.10-fix-translations.patch delete mode 100644 workrave-6f9bc5d-fix-desktop-translation.patch diff --git a/.gitignore b/.gitignore index 4240c49..03e240a 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ workrave-1.9.1.tar.gz /workrave-1.9.3.tar.gz /workrave-1.9.911-6f9bc5d.tar.gz /workrave-1.10.tar.gz +/workrave-v1_10_10.tar.gz diff --git a/sources b/sources index 3995c57..9d0eb0c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5b76c2ef8e1dfede69c4e0d4bca9dcb9 workrave-1.10.tar.gz +cf827672c8a1ece074f8ddfcf73d0fe2 workrave-v1_10_10.tar.gz diff --git a/workrave-1.10.10-fix-translations.patch b/workrave-1.10.10-fix-translations.patch new file mode 100644 index 0000000..669f224 --- /dev/null +++ b/workrave-1.10.10-fix-translations.patch @@ -0,0 +1,11 @@ +--- a/po/pl.po 2015-12-12 07:10:11.000000000 -0600 ++++ b/po/pl.po 2016-02-26 10:54:22.371044284 -0600 +@@ -279,7 +279,7 @@ + "This program assists in the prevention and recovery of Repetitive Strain " + "Injury (RSI)." + msgstr "" +-"Program pomaga w zapobieganiu urazom na skutek chronicznego przeciążenia\n" ++"Program pomaga w zapobieganiu urazom na skutek chronicznego przeciążenia " + "- RSI (Repetitive Strain Injury) oraz wspomaga rekonwalescencję." + + #: ../frontend/applets/gnome3/src/WorkraveApplet.c:645 diff --git a/workrave-6f9bc5d-fix-desktop-translation.patch b/workrave-6f9bc5d-fix-desktop-translation.patch deleted file mode 100644 index 228be2d..0000000 --- a/workrave-6f9bc5d-fix-desktop-translation.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -up workrave-6f9bc5d9d66c6042923ca39367f54db39ecd914a/po/pl.po.fixtrans workrave-6f9bc5d9d66c6042923ca39367f54db39ecd914a/po/pl.po ---- workrave-6f9bc5d9d66c6042923ca39367f54db39ecd914a/po/pl.po.fixtrans 2013-01-08 10:35:25.349987436 -0500 -+++ workrave-6f9bc5d9d66c6042923ca39367f54db39ecd914a/po/pl.po 2013-01-08 10:35:40.498995191 -0500 -@@ -904,8 +904,7 @@ msgstr "Opóźnienie trwa:" - msgid "" - "Assists in the prevention and recovery of Repetitive Strain Injury (RSI)" - msgstr "" --"Pomaga w zapobieganiu urazom na skutek chronicznego przeciążenia\n" --"- RSI (Repetitive Strain Injury) oraz wspomaga rekonwalescencję" -+"Pomaga w zapobieganiu urazom na skutek chronicznego przeciążenia - RSI (Repetitive Strain Injury) oraz wspomaga rekonwalescencję" - - #: ../frontend/plugin/distribution/gtkmm/src/NetworkJoinDialog.cc:55 - #: ../frontend/plugin/distribution/gtkmm/src/NetworkJoinDialog.cc:79 -diff -up workrave-6f9bc5d9d66c6042923ca39367f54db39ecd914a/po/ru.po.fixtrans workrave-6f9bc5d9d66c6042923ca39367f54db39ecd914a/po/ru.po ---- workrave-6f9bc5d9d66c6042923ca39367f54db39ecd914a/po/ru.po.fixtrans 2013-01-08 10:35:05.755978135 -0500 -+++ workrave-6f9bc5d9d66c6042923ca39367f54db39ecd914a/po/ru.po 2013-01-08 10:35:16.631982923 -0500 -@@ -760,8 +760,7 @@ msgstr "Расположение в си - msgid "" - "Assists in the prevention and recovery of Repetitive Strain Injury (RSI)" - msgstr "" --"Эта программа помогает в предупреждении и лечении туннельного синдрома\n " --"запястья и снятии общего мышечного напряжения." -+"Эта программа помогает в предупреждении и лечении туннельного синдрома запястья и снятии общего мышечного напряжения." - - #: ../frontend/gtkmm/src/gnome_applet/GNOME_WorkraveApplet.xml.in.h:1 - #: ../frontend/gtkmm/src/gnome_applet3/WorkraveApplet.c:874 diff --git a/workrave.spec b/workrave.spec index 669e53a..9bb83ba 100644 --- a/workrave.spec +++ b/workrave.spec @@ -1,55 +1,111 @@ +%global gnome_flashback 0 +%global mate 1 +%global xfce 1 + Name: workrave -Version: 1.10 -Release: 10%{?dist} +Version: 1.10.10 +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+ Group: Applications/Productivity URL: http://www.workrave.org/ -# Using github checkout: -# https://github.com/rcaelers/workrave -# Source0: http://downloads.sourceforge.net/workrave/%{name}-%{version}.tar.gz -Source0: https://github.com/rcaelers/workrave/archive/%{commit}/%{name}-%{version}.tar.gz -Patch1: workrave-6f9bc5d-fix-desktop-translation.patch +%global tag %(echo %{version} | sed -e 's/\\./_/g') +Source0: https://github.com/rcaelers/workrave/archive/v%{tag}/%{name}-v%{tag}.tar.gz +Patch1: workrave-1.10.10-fix-translations.patch +Patch2: workrave-1.10.10-gnome-shell-versions.patch -BuildRequires: glib2-devel >= 2.28.0 -BuildRequires: gtk3-devel >= 3.0.0 -BuildRequires: libsigc++20-devel >= 2.2.4.2 -BuildRequires: glibmm24-devel >= 2.28.0 -BuildRequires: gtkmm30-devel >= 3.0.0 -BuildRequires: gobject-introspection-devel -BuildRequires: gettext -BuildRequires: desktop-file-utils -BuildRequires: libXmu-devel -BuildRequires: libXt-devel BuildRequires: libXtst-devel BuildRequires: libXScrnSaver-devel -# Temporarily disabled because not usable without panel -#BuildRequires: dbus-devel -BuildRequires: gstreamer-devel -BuildRequires: intltool +BuildRequires: pkgconfig(ice) +BuildRequires: pkgconfig(sm) +BuildRequires: pkgconfig(glib-2.0) >= 2.28.0 +BuildRequires: pkgconfig(gio-2.0) >= 2.26.0 +BuildRequires: pkgconfig(gtk+-3.0) >= 3.0.0 +BuildRequires: pkgconfig(sigc++-2.0) >= 2.2.4.2 +BuildRequires: pkgconfig(glibmm-2.4) >= 2.28.0 +BuildRequires: pkgconfig(gtkmm-3.0) >= 3.0.0 +BuildRequires: gobject-introspection-devel >= 0.6.7 +BuildRequires: pkgconfig(indicator3-0.4) >= 0.3.19 +BuildRequires: pkgconfig(dbusmenu-glib-0.4) >= 0.1.1 +BuildRequires: pkgconfig(dbusmenu-gtk3-0.4) >= 0.3.95 BuildRequires: python-cheetah -BuildRequires: pulseaudio-libs-devel -BuildRequires: autoconf, automake, libtool +BuildRequires: pkgconfig(gstreamer-1.0) +BuildRequires: pkgconfig(libpulse) >= 0.9.15 +BuildRequires: pkgconfig(libpulse-mainloop-glib) >= 0.9.15 +BuildRequires: gettext +BuildRequires: intltool +BuildRequires: autoconf, automake, libtool, autoconf-archive +BuildRequires: desktop-file-utils +%if 0%{?gnome_flashback} +BuildRequires: pkgconfig(libpanel-applet) +%endif +%if 0%{?xfce} || 0%{?mate} +BuildRequires: pkgconfig(gtk+-2.0) >= 2.6.0 +%endif +%if 0%{?xfce} +BuildRequires: pkgconfig(libxfce4panel-1.0) >= 4.4 +%endif +%if 0%{?mate} +BuildRequires: pkgconfig(libmatepanelapplet-4.0) +%endif Requires: dbus +Recommends: gstreamer1-plugins-base +Recommends: gstreamer1-plugins-good +Obsoletes: %{name}-devel < %{version}-%{release} %description Workrave is a program that assists in the recovery and prevention of Repetitive Strain Injury (RSI). The program frequently alerts you to take micro-pauses, rest breaks and restricts you to your daily limit. -%package devel +%package gnome-flashback Requires: %{name} = %{version}-%{release} -Summary: Development files for workrave +Summary: Workrave applet for GNOME Flashback + +%description gnome-flashback +%{description} + +This package provides an applet for the GNOME Flashback panel. + +%package gtk2 +Requires: %{name} = %{version}-%{release} +Summary: Support library for gtk2-based Workrave applets + +%description gtk2 +%{description} + +This package provides a support library for gtk2-based applets. + +%package mate +Requires: %{name} = %{version}-%{release} +Requires: %{name}-gtk2 = %{version}-%{release} +Summary: Workrave applet for MATE + +%description mate +%{description} + +This package provides an applet for the MATE panel. + +%package xfce +Requires: %{name} = %{version}-%{release} +Requires: %{name}-gtk2 = %{version}-%{release} +Summary: Workrave applet for Xfce + +%description xfce +%{description} + +This package provides an applet for the Xfce panel. -%description devel -Development files for workrave. %prep -%setup -q +%setup -q -n workrave-%{tag} %patch1 -p1 -b .fixpl +%patch2 -p1 touch ChangeLog +# https://bugzilla.redhat.com/show_bug.cgi?id=304121 +sed -i -e '/^DISTRIBUTION_HOME/s/\/$//' frontend/gtkmm/src/Makefile.* %build if [ ! -x configure ]; then @@ -57,14 +113,34 @@ if [ ! -x configure ]; then NOCONFIGURE=1 ./autogen.sh fi -%configure --disable-dbus --disable-xml --enable-gnome3 --disable-static +# gnome3 is flashback panel applet, not gnome-shell +%configure \ +%if 0%{?gnome_flashback} + --enable-gnome3 \ +%else + --disable-gnome3 \ +%endif +%if 0%{?mate} + --enable-mate \ +%else + --disable-mate \ +%endif +%if 0%{?xfce} + --enable-xfce \ +%else + --disable-xfce \ +%endif + --disable-static --disable-xml -make V=1 +make V=1 %{_smp_mflags} %install make install DESTDIR=%{buildroot} -rm -rf %{buildroot}%{_libdir}/*.la %{buildroot}%{_libdir}/*.a +find %{buildroot} -name '*.la' -delete +# workrave does not provide a public API +rm -f %{buildroot}%{_datadir}/gir-1.0/*.gir +rm -f %{buildroot}%{_libdir}/*.so %find_lang %{name} @@ -73,9 +149,10 @@ desktop-file-install \ --delete-original \ %{buildroot}%{_datadir}/applications/%{name}.desktop + %files -f %{name}.lang %doc AUTHORS COPYING NEWS README -%{_bindir}/* +%{_bindir}/workrave %{_datadir}/workrave/ %{_datadir}/sounds/workrave/ %{_datadir}/icons/hicolor/16x16/apps/workrave.png @@ -87,22 +164,59 @@ desktop-file-install \ %{_datadir}/icons/hicolor/128x128/apps/workrave.png %{_datadir}/icons/hicolor/scalable/workrave-sheep.svg %{_datadir}/icons/hicolor/scalable/apps/workrave.svg +%{_datadir}/appdata/workrave.appdata.xml %{_datadir}/applications/workrave.desktop -#%{_datadir}/dbus-1/services/org.workrave.Workrave.service -#%{_datadir}/dbus-1/services/org.gnome.panel.applet.WorkraveAppletFactory.service -#%{_datadir}/glib-2.0/schemas/org.workrave.*.xml -#%{_datadir}/gnome-panel/4.0/applets/org.workrave.WorkraveApplet.panel-applet -#%{_datadir}/gnome-panel/ui/workrave-gnome-applet-menu.xml -%{_datadir}/gnome-shell/extensions/workrave@workrave.org/ +%{_datadir}/dbus-1/services/org.workrave.Workrave.service +%{_datadir}/glib-2.0/schemas/org.workrave.*.xml +# support library for gtk3 applets %{_libdir}/girepository-1.0/Workrave-1.0.typelib -#%{_libexecdir}/workrave-applet %{_libdir}/libworkrave-private-1.0.so.* +# gnome-shell extension +%dir %{_datadir}/gnome-shell/ +%dir %{_datadir}/gnome-shell/extensions/ +%{_datadir}/gnome-shell/extensions/workrave@workrave.org/ +# cinnamon applet +%dir %{_datadir}/cinnamon/ +%dir %{_datadir}/cinnamon/applets/ +%{_datadir}/cinnamon/applets/workrave@workrave.org/ +# indicator applet +%dir %{_libdir}/indicators3/ +%dir %{_libdir}/indicators3/7/ +%{_libdir}/indicators3/7/libworkrave.so -%files devel -%{_datadir}/gir-1.0/Workrave-1.0.gir -%{_libdir}/libworkrave-private-1.0.so +%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 +%endif + +%if 0%{?mate} || 0%{?xfce} +%files gtk2 +%{_libdir}/libworkrave-gtk2-private-1.0.so.* +%endif + +%if 0%{?xfce} +%files xfce +%{_libdir}/xfce4/panel-plugins/xfce4-workrave-plugin +%{_datadir}/xfce4/panel-plugins/workrave-xfce-applet.desktop +%endif + +%if 0%{?mate} +%files mate +%{_libdir}/mate-applets/workrave-applet +%{_datadir}/dbus-1/services/org.mate.panel.applet.WorkraveAppletFactory.service +%{_datadir}/mate-panel/applets/org.workrave.WorkraveApplet.mate-panel-applet +%{_datadir}/mate-panel/ui/workrave-menu.xml +%endif %changelog +* Fri Feb 26 2016 Yaakov Selkowitz - 1.10.10-1 +- new version +- Add Cinnamon, Indicator, MATE, Xfce applets +- Cleanup spec + * Fri Feb 05 2016 Fedora Release Engineering - 1.10-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From fd030aa82cbb31cec19c41e29ec7f366e052bf81 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Fri, 26 Feb 2016 14:19:05 -0600 Subject: [PATCH 28/90] Commit missing patch --- workrave-1.10.10-gnome-shell-versions.patch | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 workrave-1.10.10-gnome-shell-versions.patch diff --git a/workrave-1.10.10-gnome-shell-versions.patch b/workrave-1.10.10-gnome-shell-versions.patch new file mode 100644 index 0000000..e49d09d --- /dev/null +++ b/workrave-1.10.10-gnome-shell-versions.patch @@ -0,0 +1,14 @@ +3.18: https://github.com/rcaelers/workrave/commit/b79490b +3.20 not added yet + +--- a/frontend/applets/gnome-shell/src/metadata.json.in 2015-12-12 07:10:11.000000000 -0600 ++++ b/frontend/applets/gnome-shell/src/metadata.json.in 2016-02-26 13:05:02.877532341 -0600 +@@ -3,7 +3,7 @@ + "uuid": "@uuid@", + "name": "Workrave", + "description": "Applet that shows all the Workrave timers.", +- "shell-version": [ "3.2", "3.3", "3.4", "3.5", "3.5.4", "3.6.0", "3.6", "3.8", "3.10", "3.12", "3.14", "3.16", "@shell_current@" ], ++ "shell-version": [ "3.2", "3.3", "3.4", "3.5", "3.5.4", "3.6.0", "3.6", "3.8", "3.10", "3.12", "3.14", "3.16", "3.18", "3.20", "@shell_current@" ], + "localedir": "@LOCALEDIR@", + "url": "@url@" + } From 09e3e33482c3873106d2f817d794e0e568b8242c Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Tue, 8 Mar 2016 14:52:15 -0600 Subject: [PATCH 29/90] EPEL-ify --- workrave.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/workrave.spec b/workrave.spec index 9bb83ba..3435867 100644 --- a/workrave.spec +++ b/workrave.spec @@ -51,8 +51,10 @@ BuildRequires: pkgconfig(libmatepanelapplet-4.0) %endif Requires: dbus +%if 0%{?fedora} Recommends: gstreamer1-plugins-base Recommends: gstreamer1-plugins-good +%endif Obsoletes: %{name}-devel < %{version}-%{release} %description From dfd2ceb8bd0bc5969ad3c3b4d17efbbd9ac56bad Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Thu, 12 May 2016 17:48:14 -0500 Subject: [PATCH 30/90] new version (#1321458) --- .gitignore | 1 + sources | 2 +- workrave-1.10.10-gnome-shell-versions.patch | 14 -------------- workrave.spec | 7 ++++--- 4 files changed, 6 insertions(+), 18 deletions(-) delete mode 100644 workrave-1.10.10-gnome-shell-versions.patch diff --git a/.gitignore b/.gitignore index 03e240a..f667958 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ workrave-1.9.1.tar.gz /workrave-1.9.911-6f9bc5d.tar.gz /workrave-1.10.tar.gz /workrave-v1_10_10.tar.gz +/workrave-v1_10_15.tar.gz diff --git a/sources b/sources index 9d0eb0c..7149e5c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -cf827672c8a1ece074f8ddfcf73d0fe2 workrave-v1_10_10.tar.gz +4a70c2e325503249d1a40fcc236d6802 workrave-v1_10_15.tar.gz diff --git a/workrave-1.10.10-gnome-shell-versions.patch b/workrave-1.10.10-gnome-shell-versions.patch deleted file mode 100644 index e49d09d..0000000 --- a/workrave-1.10.10-gnome-shell-versions.patch +++ /dev/null @@ -1,14 +0,0 @@ -3.18: https://github.com/rcaelers/workrave/commit/b79490b -3.20 not added yet - ---- a/frontend/applets/gnome-shell/src/metadata.json.in 2015-12-12 07:10:11.000000000 -0600 -+++ b/frontend/applets/gnome-shell/src/metadata.json.in 2016-02-26 13:05:02.877532341 -0600 -@@ -3,7 +3,7 @@ - "uuid": "@uuid@", - "name": "Workrave", - "description": "Applet that shows all the Workrave timers.", -- "shell-version": [ "3.2", "3.3", "3.4", "3.5", "3.5.4", "3.6.0", "3.6", "3.8", "3.10", "3.12", "3.14", "3.16", "@shell_current@" ], -+ "shell-version": [ "3.2", "3.3", "3.4", "3.5", "3.5.4", "3.6.0", "3.6", "3.8", "3.10", "3.12", "3.14", "3.16", "3.18", "3.20", "@shell_current@" ], - "localedir": "@LOCALEDIR@", - "url": "@url@" - } diff --git a/workrave.spec b/workrave.spec index 3435867..f641a5c 100644 --- a/workrave.spec +++ b/workrave.spec @@ -3,7 +3,7 @@ %global xfce 1 Name: workrave -Version: 1.10.10 +Version: 1.10.15 Release: 1%{?dist} Summary: Program that assists in the recovery and prevention of RSI # Based on older packages by Dag Wieers and Steve Ratcliffe @@ -13,7 +13,6 @@ 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 Patch1: workrave-1.10.10-fix-translations.patch -Patch2: workrave-1.10.10-gnome-shell-versions.patch BuildRequires: libXtst-devel BuildRequires: libXScrnSaver-devel @@ -104,7 +103,6 @@ This package provides an applet for the Xfce panel. %prep %setup -q -n workrave-%{tag} %patch1 -p1 -b .fixpl -%patch2 -p1 touch ChangeLog # https://bugzilla.redhat.com/show_bug.cgi?id=304121 sed -i -e '/^DISTRIBUTION_HOME/s/\/$//' frontend/gtkmm/src/Makefile.* @@ -214,6 +212,9 @@ desktop-file-install \ %endif %changelog +* Thu May 12 2016 Yaakov Selkowitz - 1.10.15-1 +- new version (#1321458) + * Fri Feb 26 2016 Yaakov Selkowitz - 1.10.10-1 - new version - Add Cinnamon, Indicator, MATE, Xfce applets From e31a4a42ef250f6943ce9e0437b4a8e706178c46 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Thu, 15 Sep 2016 23:34:08 -0500 Subject: [PATCH 31/90] new version (#1376625) --- .gitignore | 1 + sources | 2 +- workrave.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index f667958..7af833c 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ workrave-1.9.1.tar.gz /workrave-1.10.tar.gz /workrave-v1_10_10.tar.gz /workrave-v1_10_15.tar.gz +/workrave-v1_10_16.tar.gz diff --git a/sources b/sources index 7149e5c..faebb6b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4a70c2e325503249d1a40fcc236d6802 workrave-v1_10_15.tar.gz +b9bf77bfe0c909fff56759e7dda40f9d workrave-v1_10_16.tar.gz diff --git a/workrave.spec b/workrave.spec index f641a5c..a481a43 100644 --- a/workrave.spec +++ b/workrave.spec @@ -3,7 +3,7 @@ %global xfce 1 Name: workrave -Version: 1.10.15 +Version: 1.10.16 Release: 1%{?dist} Summary: Program that assists in the recovery and prevention of RSI # Based on older packages by Dag Wieers and Steve Ratcliffe @@ -212,6 +212,9 @@ desktop-file-install \ %endif %changelog +* Fri Sep 16 2016 Yaakov Selkowitz - 1.10.16-1 +- new version (#1376625) + * Thu May 12 2016 Yaakov Selkowitz - 1.10.15-1 - new version (#1321458) From 3e2060c070c8d5f66365c6df0626e3e4c3247d8b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 17:31:44 +0000 Subject: [PATCH 32/90] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- workrave.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/workrave.spec b/workrave.spec index a481a43..8bc3c03 100644 --- a/workrave.spec +++ b/workrave.spec @@ -4,7 +4,7 @@ Name: workrave Version: 1.10.16 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Program that assists in the recovery and prevention of RSI # Based on older packages by Dag Wieers and Steve Ratcliffe License: GPLv3+ @@ -212,6 +212,9 @@ desktop-file-install \ %endif %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 1.10.16-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Fri Sep 16 2016 Yaakov Selkowitz - 1.10.16-1 - new version (#1376625) From 24141f6b1fcf41c68340d4c4392f35232c64a118 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 21:45:09 +0000 Subject: [PATCH 33/90] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- workrave.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/workrave.spec b/workrave.spec index 8bc3c03..206e838 100644 --- a/workrave.spec +++ b/workrave.spec @@ -4,7 +4,7 @@ Name: workrave Version: 1.10.16 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Program that assists in the recovery and prevention of RSI # Based on older packages by Dag Wieers and Steve Ratcliffe License: GPLv3+ @@ -212,6 +212,9 @@ desktop-file-install \ %endif %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 1.10.16-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Sat Feb 11 2017 Fedora Release Engineering - 1.10.16-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 143917afa550b27ed0c647f86ec3297922983ef8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 10:22:42 +0000 Subject: [PATCH 34/90] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- workrave.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/workrave.spec b/workrave.spec index 206e838..52922aa 100644 --- a/workrave.spec +++ b/workrave.spec @@ -4,7 +4,7 @@ Name: workrave Version: 1.10.16 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Program that assists in the recovery and prevention of RSI # Based on older packages by Dag Wieers and Steve Ratcliffe License: GPLv3+ @@ -212,6 +212,9 @@ desktop-file-install \ %endif %changelog +* Thu Aug 03 2017 Fedora Release Engineering - 1.10.16-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Thu Jul 27 2017 Fedora Release Engineering - 1.10.16-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 8c83b849b2bc28d6c039cd86ee549388a07a81b0 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Mon, 13 Nov 2017 21:32:27 -0600 Subject: [PATCH 35/90] new version (#1508256) --- .gitignore | 1 + sources | 2 +- workrave.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 7af833c..bb343b6 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ workrave-1.9.1.tar.gz /workrave-v1_10_10.tar.gz /workrave-v1_10_15.tar.gz /workrave-v1_10_16.tar.gz +/workrave-v1_10_20.tar.gz diff --git a/sources b/sources index faebb6b..a3dca92 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b9bf77bfe0c909fff56759e7dda40f9d workrave-v1_10_16.tar.gz +SHA512 (workrave-v1_10_20.tar.gz) = fc8d98aa560946f00ee30be0c28648245a425cd3fddeba8fbdd61fb89d107cc8085d5c4d8a326c739b394e6baada2b28cf98ce9ccaf85dca6bfaa1ae78d4ce56 diff --git a/workrave.spec b/workrave.spec index 52922aa..8bacbfd 100644 --- a/workrave.spec +++ b/workrave.spec @@ -3,8 +3,8 @@ %global xfce 1 Name: workrave -Version: 1.10.16 -Release: 4%{?dist} +Version: 1.10.20 +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+ @@ -212,6 +212,9 @@ desktop-file-install \ %endif %changelog +* Tue Nov 14 2017 Yaakov Selkowitz - 1.10.20-1 +- new version (#1508256) + * Thu Aug 03 2017 Fedora Release Engineering - 1.10.16-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From 4c38a0893fcd7388aecd80578d53788d3afc2571 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Mon, 13 Nov 2017 21:54:00 -0600 Subject: [PATCH 36/90] Update %doc list --- workrave.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workrave.spec b/workrave.spec index 8bacbfd..dbac72f 100644 --- a/workrave.spec +++ b/workrave.spec @@ -151,7 +151,7 @@ desktop-file-install \ %files -f %{name}.lang -%doc AUTHORS COPYING NEWS README +%doc AUTHORS COPYING NEWS README.md %{_bindir}/workrave %{_datadir}/workrave/ %{_datadir}/sounds/workrave/ From 0d3af42564b024ba55efea51ca1f060d5c31b7df Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 21:08:27 +0000 Subject: [PATCH 37/90] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- workrave.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/workrave.spec b/workrave.spec index dbac72f..68d11bc 100644 --- a/workrave.spec +++ b/workrave.spec @@ -4,7 +4,7 @@ Name: workrave Version: 1.10.20 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Program that assists in the recovery and prevention of RSI # Based on older packages by Dag Wieers and Steve Ratcliffe License: GPLv3+ @@ -212,6 +212,9 @@ desktop-file-install \ %endif %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 1.10.20-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Tue Nov 14 2017 Yaakov Selkowitz - 1.10.20-1 - new version (#1508256) From 3031759a2525d7e40cbe3f684b58fcfe4271a240 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 08:59:01 +0000 Subject: [PATCH 38/90] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- workrave.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/workrave.spec b/workrave.spec index 68d11bc..4d28fbc 100644 --- a/workrave.spec +++ b/workrave.spec @@ -4,7 +4,7 @@ Name: workrave Version: 1.10.20 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Program that assists in the recovery and prevention of RSI # Based on older packages by Dag Wieers and Steve Ratcliffe License: GPLv3+ @@ -212,6 +212,9 @@ desktop-file-install \ %endif %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 1.10.20-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Fri Feb 09 2018 Fedora Release Engineering - 1.10.20-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From fcda5f3d35464ea785388041ef419281abc72547 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:18:30 +0100 Subject: [PATCH 39/90] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- workrave.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/workrave.spec b/workrave.spec index 4d28fbc..29faa80 100644 --- a/workrave.spec +++ b/workrave.spec @@ -8,7 +8,6 @@ Release: 3%{?dist} Summary: Program that assists in the recovery and prevention of RSI # Based on older packages by Dag Wieers and Steve Ratcliffe License: GPLv3+ -Group: Applications/Productivity 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 From c49cf59a3085fac56ded71c51e798c06ecbcd9ed Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 3 Feb 2019 11:55:10 +0000 Subject: [PATCH 40/90] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- workrave.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/workrave.spec b/workrave.spec index 29faa80..d780af8 100644 --- a/workrave.spec +++ b/workrave.spec @@ -4,7 +4,7 @@ Name: workrave Version: 1.10.20 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Program that assists in the recovery and prevention of RSI # Based on older packages by Dag Wieers and Steve Ratcliffe License: GPLv3+ @@ -211,6 +211,9 @@ desktop-file-install \ %endif %changelog +* Sun Feb 03 2019 Fedora Release Engineering - 1.10.20-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Sat Jul 14 2018 Fedora Release Engineering - 1.10.20-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 37d26f098714e2f136cc0e279899e2f7ff6090f8 Mon Sep 17 00:00:00 2001 From: Lukas Zapletal Date: Fri, 12 Apr 2019 13:41:47 +0200 Subject: [PATCH 41/90] Updated X11 and python3 deps --- workrave.spec | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/workrave.spec b/workrave.spec index d780af8..0485ff4 100644 --- a/workrave.spec +++ b/workrave.spec @@ -4,7 +4,7 @@ Name: workrave Version: 1.10.20 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Program that assists in the recovery and prevention of RSI # Based on older packages by Dag Wieers and Steve Ratcliffe License: GPLv3+ @@ -13,7 +13,8 @@ URL: http://www.workrave.org/ Source0: https://github.com/rcaelers/workrave/archive/v%{tag}/%{name}-v%{tag}.tar.gz Patch1: workrave-1.10.10-fix-translations.patch -BuildRequires: libXtst-devel +BuildRequires: gcc-c++ +BuildRequires: libX11-devel BuildRequires: libXScrnSaver-devel BuildRequires: pkgconfig(ice) BuildRequires: pkgconfig(sm) @@ -27,7 +28,9 @@ BuildRequires: gobject-introspection-devel >= 0.6.7 BuildRequires: pkgconfig(indicator3-0.4) >= 0.3.19 BuildRequires: pkgconfig(dbusmenu-glib-0.4) >= 0.1.1 BuildRequires: pkgconfig(dbusmenu-gtk3-0.4) >= 0.3.95 -BuildRequires: python-cheetah +BuildRequires: python3 +BuildRequires: python3-devel +BuildRequires: python3-cheetah BuildRequires: pkgconfig(gstreamer-1.0) BuildRequires: pkgconfig(libpulse) >= 0.9.15 BuildRequires: pkgconfig(libpulse-mainloop-glib) >= 0.9.15 @@ -106,6 +109,11 @@ touch ChangeLog # https://bugzilla.redhat.com/show_bug.cgi?id=304121 sed -i -e '/^DISTRIBUTION_HOME/s/\/$//' frontend/gtkmm/src/Makefile.* +# upstream is python2 +2to3 --write --nobackups common/bin/dbusgen.py +pathfix.py -pni %{__python3} common/bin/dbusgen.py +sed -i 's/AC_CHECK_PROG(PYTHON, python, python)/AC_CHECK_PROG(PYTHON, python3, python3)/' configure.ac + %build if [ ! -x configure ]; then ### Needed for snapshot releases. @@ -211,6 +219,9 @@ desktop-file-install \ %endif %changelog +* Fri Apr 12 2019 Lukas Zapletal - 1.10.20-5 +- Updated X11 and python3 deps + * Sun Feb 03 2019 Fedora Release Engineering - 1.10.20-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From d3b05779a1b84d5bdd99b547ba9e8e7d62ad4ee1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 03:41:35 +0000 Subject: [PATCH 42/90] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- workrave.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/workrave.spec b/workrave.spec index 0485ff4..d67329f 100644 --- a/workrave.spec +++ b/workrave.spec @@ -4,7 +4,7 @@ Name: workrave Version: 1.10.20 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Program that assists in the recovery and prevention of RSI # Based on older packages by Dag Wieers and Steve Ratcliffe License: GPLv3+ @@ -219,6 +219,9 @@ desktop-file-install \ %endif %changelog +* Sat Jul 27 2019 Fedora Release Engineering - 1.10.20-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Fri Apr 12 2019 Lukas Zapletal - 1.10.20-5 - Updated X11 and python3 deps From 1243f106a86db3fd8811ed806911427cf141a71c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 03:55:34 +0000 Subject: [PATCH 43/90] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- workrave.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/workrave.spec b/workrave.spec index d67329f..988d5fa 100644 --- a/workrave.spec +++ b/workrave.spec @@ -4,7 +4,7 @@ Name: workrave Version: 1.10.20 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Program that assists in the recovery and prevention of RSI # Based on older packages by Dag Wieers and Steve Ratcliffe License: GPLv3+ @@ -219,6 +219,9 @@ desktop-file-install \ %endif %changelog +* Fri Jan 31 2020 Fedora Release Engineering - 1.10.20-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Sat Jul 27 2019 Fedora Release Engineering - 1.10.20-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 7fb5a4824a7ba9e50976423a8a34cdf31a3cd9a4 Mon Sep 17 00:00:00 2001 From: Lukas Zapletal Date: Fri, 27 Mar 2020 10:17:35 +0100 Subject: [PATCH 44/90] Version bump to 1.10.37-1 --- .gitignore | 3 ++ sources | 2 +- workrave-1.10.10-fix-translations.patch | 11 ------- workrave.spec | 38 +++++++++---------------- 4 files changed, 18 insertions(+), 36 deletions(-) delete mode 100644 workrave-1.10.10-fix-translations.patch diff --git a/.gitignore b/.gitignore index bb343b6..4b3df79 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ +/results_workrave +/workrave*rpm workrave-1.9.1.tar.gz /workrave-1.9.2.tar.gz /workrave-1.9.3.tar.gz @@ -7,3 +9,4 @@ workrave-1.9.1.tar.gz /workrave-v1_10_15.tar.gz /workrave-v1_10_16.tar.gz /workrave-v1_10_20.tar.gz +/workrave-v1_10_37.tar.gz diff --git a/sources b/sources index a3dca92..03e995d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (workrave-v1_10_20.tar.gz) = fc8d98aa560946f00ee30be0c28648245a425cd3fddeba8fbdd61fb89d107cc8085d5c4d8a326c739b394e6baada2b28cf98ce9ccaf85dca6bfaa1ae78d4ce56 +SHA512 (workrave-v1_10_37.tar.gz) = 824117af21d8fd829b0a4fb95727bbce9b5e9a8b5f39db7ea5ff3ccb2d94badff746c20a768b5a94a7428704d607cbba2a30adb5df29e2b64708e9bd3acb1a60 diff --git a/workrave-1.10.10-fix-translations.patch b/workrave-1.10.10-fix-translations.patch deleted file mode 100644 index 669f224..0000000 --- a/workrave-1.10.10-fix-translations.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/po/pl.po 2015-12-12 07:10:11.000000000 -0600 -+++ b/po/pl.po 2016-02-26 10:54:22.371044284 -0600 -@@ -279,7 +279,7 @@ - "This program assists in the prevention and recovery of Repetitive Strain " - "Injury (RSI)." - msgstr "" --"Program pomaga w zapobieganiu urazom na skutek chronicznego przeciążenia\n" -+"Program pomaga w zapobieganiu urazom na skutek chronicznego przeciążenia " - "- RSI (Repetitive Strain Injury) oraz wspomaga rekonwalescencję." - - #: ../frontend/applets/gnome3/src/WorkraveApplet.c:645 diff --git a/workrave.spec b/workrave.spec index 988d5fa..7d989aa 100644 --- a/workrave.spec +++ b/workrave.spec @@ -3,15 +3,17 @@ %global xfce 1 Name: workrave -Version: 1.10.20 -Release: 7%{?dist} +Version: 1.10.37 +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 -Patch1: workrave-1.10.10-fix-translations.patch + +Obsoletes: %{name}-gtk2 < 1.10.37-1 +Provides: %{name}-gtk2 = %{?epoch:%{epoch}:}%{version}-%{release} BuildRequires: gcc-c++ BuildRequires: libX11-devel @@ -28,9 +30,11 @@ BuildRequires: gobject-introspection-devel >= 0.6.7 BuildRequires: pkgconfig(indicator3-0.4) >= 0.3.19 BuildRequires: pkgconfig(dbusmenu-glib-0.4) >= 0.1.1 BuildRequires: pkgconfig(dbusmenu-gtk3-0.4) >= 0.3.95 +BuildRequires: boost-devel BuildRequires: python3 BuildRequires: python3-devel BuildRequires: python3-cheetah +BuildRequires: python3-jinja2 BuildRequires: pkgconfig(gstreamer-1.0) BuildRequires: pkgconfig(libpulse) >= 0.9.15 BuildRequires: pkgconfig(libpulse-mainloop-glib) >= 0.9.15 @@ -72,18 +76,8 @@ Summary: Workrave applet for GNOME Flashback This package provides an applet for the GNOME Flashback panel. -%package gtk2 -Requires: %{name} = %{version}-%{release} -Summary: Support library for gtk2-based Workrave applets - -%description gtk2 -%{description} - -This package provides a support library for gtk2-based applets. - %package mate Requires: %{name} = %{version}-%{release} -Requires: %{name}-gtk2 = %{version}-%{release} Summary: Workrave applet for MATE %description mate @@ -93,7 +87,6 @@ This package provides an applet for the MATE panel. %package xfce Requires: %{name} = %{version}-%{release} -Requires: %{name}-gtk2 = %{version}-%{release} Summary: Workrave applet for Xfce %description xfce @@ -104,14 +97,13 @@ This package provides an applet for the Xfce panel. %prep %setup -q -n workrave-%{tag} -%patch1 -p1 -b .fixpl touch ChangeLog # https://bugzilla.redhat.com/show_bug.cgi?id=304121 sed -i -e '/^DISTRIBUTION_HOME/s/\/$//' frontend/gtkmm/src/Makefile.* # upstream is python2 -2to3 --write --nobackups common/bin/dbusgen.py -pathfix.py -pni %{__python3} common/bin/dbusgen.py +2to3 --write --nobackups libs/dbus/bin/dbusgen.py +pathfix.py -pni %{__python3} libs/dbus/bin/dbusgen.py sed -i 's/AC_CHECK_PROG(PYTHON, python, python)/AC_CHECK_PROG(PYTHON, python3, python3)/' configure.ac %build @@ -171,7 +163,7 @@ desktop-file-install \ %{_datadir}/icons/hicolor/128x128/apps/workrave.png %{_datadir}/icons/hicolor/scalable/workrave-sheep.svg %{_datadir}/icons/hicolor/scalable/apps/workrave.svg -%{_datadir}/appdata/workrave.appdata.xml +%{_datadir}/metainfo/workrave.appdata.xml %{_datadir}/applications/workrave.desktop %{_datadir}/dbus-1/services/org.workrave.Workrave.service %{_datadir}/glib-2.0/schemas/org.workrave.*.xml @@ -199,14 +191,9 @@ desktop-file-install \ %{_datadir}/gnome-panel/ui/workrave-gnome-applet-menu.xml %endif -%if 0%{?mate} || 0%{?xfce} -%files gtk2 -%{_libdir}/libworkrave-gtk2-private-1.0.so.* -%endif - %if 0%{?xfce} %files xfce -%{_libdir}/xfce4/panel-plugins/xfce4-workrave-plugin +%{_libdir}/xfce4/panel/plugins/libworkrave-plugin.so %{_datadir}/xfce4/panel-plugins/workrave-xfce-applet.desktop %endif @@ -219,6 +206,9 @@ desktop-file-install \ %endif %changelog +* Fri Mar 27 2020 Lukas Zapletal - 1.10.37-1 +- new version + * Fri Jan 31 2020 Fedora Release Engineering - 1.10.20-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From b059b6a22d63a53d247c2438dd1a0e6245ff8325 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 14:19:09 +0000 Subject: [PATCH 45/90] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- workrave.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/workrave.spec b/workrave.spec index 7d989aa..b58d7f7 100644 --- a/workrave.spec +++ b/workrave.spec @@ -4,7 +4,7 @@ Name: workrave Version: 1.10.37 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Program that assists in the recovery and prevention of RSI # Based on older packages by Dag Wieers and Steve Ratcliffe License: GPLv3+ @@ -206,6 +206,9 @@ desktop-file-install \ %endif %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 1.10.37-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Fri Mar 27 2020 Lukas Zapletal - 1.10.37-1 - new version From 0dbc819b87f16e194a2cdad8198adb8508f87f27 Mon Sep 17 00:00:00 2001 From: Lukas Zapletal Date: Fri, 2 Oct 2020 08:28:17 +0200 Subject: [PATCH 46/90] Bump to 1.10.44 --- .gitignore | 1 + sources | 2 +- workrave.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 4b3df79..26ed692 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ workrave-1.9.1.tar.gz /workrave-v1_10_16.tar.gz /workrave-v1_10_20.tar.gz /workrave-v1_10_37.tar.gz +/workrave-v1_10_44.tar.gz diff --git a/sources b/sources index 03e995d..132e8ea 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (workrave-v1_10_37.tar.gz) = 824117af21d8fd829b0a4fb95727bbce9b5e9a8b5f39db7ea5ff3ccb2d94badff746c20a768b5a94a7428704d607cbba2a30adb5df29e2b64708e9bd3acb1a60 +SHA512 (workrave-v1_10_44.tar.gz) = 582871be329fa67975d89206ebef9c4151e9b89eaab2848a1e113f91dd55cb2e5a80d790f9bd8195ab182eb95c99d3c3494da11673500b9680f2086a061e8d16 diff --git a/workrave.spec b/workrave.spec index b58d7f7..3945806 100644 --- a/workrave.spec +++ b/workrave.spec @@ -3,8 +3,8 @@ %global xfce 1 Name: workrave -Version: 1.10.37 -Release: 2%{?dist} +Version: 1.10.44 +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+ @@ -206,6 +206,9 @@ desktop-file-install \ %endif %changelog +* Fri Oct 02 2020 Lukas Zapletal - 1.10.44-1 +- new version + * Wed Jul 29 2020 Fedora Release Engineering - 1.10.37-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From aaed0c40a84ce39a5b9cb708ee50746b9c8ba6d7 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Sat, 9 Jan 2021 01:01:18 +0000 Subject: [PATCH 47/90] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- workrave.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/workrave.spec b/workrave.spec index 3945806..8596e12 100644 --- a/workrave.spec +++ b/workrave.spec @@ -15,6 +15,7 @@ Source0: https://github.com/rcaelers/workrave/archive/v%{tag}/%{name}-v%{tag}.ta Obsoletes: %{name}-gtk2 < 1.10.37-1 Provides: %{name}-gtk2 = %{?epoch:%{epoch}:}%{version}-%{release} +BuildRequires: make BuildRequires: gcc-c++ BuildRequires: libX11-devel BuildRequires: libXScrnSaver-devel From c79370ae496ec7768afc9643c3f35b509d6da00d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 23:39:48 +0000 Subject: [PATCH 48/90] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- workrave.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/workrave.spec b/workrave.spec index 8596e12..676d0c4 100644 --- a/workrave.spec +++ b/workrave.spec @@ -4,7 +4,7 @@ Name: workrave Version: 1.10.44 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Program that assists in the recovery and prevention of RSI # Based on older packages by Dag Wieers and Steve Ratcliffe License: GPLv3+ @@ -207,6 +207,9 @@ desktop-file-install \ %endif %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 1.10.44-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Fri Oct 02 2020 Lukas Zapletal - 1.10.44-1 - new version From 4a0e1b61ca9c0fc87e66c646e24220194efed926 Mon Sep 17 00:00:00 2001 From: Lukas Zapletal Date: Mon, 8 Feb 2021 11:57:42 +0100 Subject: [PATCH 49/90] Update xfce4 panel PC depednency --- workrave.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workrave.spec b/workrave.spec index 676d0c4..677d4a4 100644 --- a/workrave.spec +++ b/workrave.spec @@ -50,7 +50,7 @@ BuildRequires: pkgconfig(libpanel-applet) BuildRequires: pkgconfig(gtk+-2.0) >= 2.6.0 %endif %if 0%{?xfce} -BuildRequires: pkgconfig(libxfce4panel-1.0) >= 4.4 +BuildRequires: pkgconfig(Libxfce4panel-1.0) >= 4.4 %endif %if 0%{?mate} BuildRequires: pkgconfig(libmatepanelapplet-4.0) From 065bb0665e7376fca27939a2ae8f855af5d6641c Mon Sep 17 00:00:00 2001 From: Lukas Zapletal Date: Tue, 9 Feb 2021 09:07:35 +0100 Subject: [PATCH 50/90] Update xfce4 panel PC depednency - fix --- workrave.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workrave.spec b/workrave.spec index 677d4a4..5e9829c 100644 --- a/workrave.spec +++ b/workrave.spec @@ -50,7 +50,7 @@ BuildRequires: pkgconfig(libpanel-applet) BuildRequires: pkgconfig(gtk+-2.0) >= 2.6.0 %endif %if 0%{?xfce} -BuildRequires: pkgconfig(Libxfce4panel-1.0) >= 4.4 +BuildRequires: pkgconfig(libxfce4panel-2.0) >= 4.4 %endif %if 0%{?mate} BuildRequires: pkgconfig(libmatepanelapplet-4.0) From 7929b35322a94a3410731213bcf4740de6eefbd3 Mon Sep 17 00:00:00 2001 From: Mukundan Ragavan Date: Mon, 8 Feb 2021 18:29:55 -0500 Subject: [PATCH 51/90] Build against xfce-4.16 --- compile_against_xfce4-panel-4.15.patch | 31 ++++++++++++++++++++++++++ workrave.spec | 14 +++++++++--- 2 files changed, 42 insertions(+), 3 deletions(-) create mode 100644 compile_against_xfce4-panel-4.15.patch diff --git a/compile_against_xfce4-panel-4.15.patch b/compile_against_xfce4-panel-4.15.patch new file mode 100644 index 0000000..b6fb243 --- /dev/null +++ b/compile_against_xfce4-panel-4.15.patch @@ -0,0 +1,31 @@ +From c596e32ebe5a0a6ded3b583e8a78df729ffde2d5 Mon Sep 17 00:00:00 2001 +From: Rob Caelers +Date: Sun, 29 Nov 2020 14:54:58 +0100 +Subject: [PATCH] Fix XFCE applet for XFCE 4.15 + +--- + frontend/applets/xfce/src/main.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/frontend/applets/xfce/src/main.c b/frontend/applets/xfce/src/main.c +index 48b481b20..e49f0bc90 100644 +--- a/frontend/applets/xfce/src/main.c ++++ b/frontend/applets/xfce/src/main.c +@@ -20,7 +20,7 @@ + #endif + + #include +-#include ++#include + + #include + +@@ -399,7 +399,7 @@ static void workrave_applet_fill(WorkraveApplet *applet) + + static void workrave_applet_construct(XfcePanelPlugin *plugin) + { +- WorkraveApplet *applet = panel_slice_new0(WorkraveApplet); ++ WorkraveApplet *applet = g_slice_new0(WorkraveApplet); + applet->plugin = plugin; + applet->image = NULL; + applet->timerbox_control = NULL; diff --git a/workrave.spec b/workrave.spec index 5e9829c..5b3d965 100644 --- a/workrave.spec +++ b/workrave.spec @@ -4,7 +4,7 @@ Name: workrave Version: 1.10.44 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Program that assists in the recovery and prevention of RSI # Based on older packages by Dag Wieers and Steve Ratcliffe License: GPLv3+ @@ -12,6 +12,9 @@ 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 +# Upstream - https://github.com/rcaelers/workrave/commit/c596e32ebe5a0a6ded3b583e8a78df729ffde2d5 +Patch0: compile_against_xfce4-panel-4.15.patch + Obsoletes: %{name}-gtk2 < 1.10.37-1 Provides: %{name}-gtk2 = %{?epoch:%{epoch}:}%{version}-%{release} @@ -47,10 +50,10 @@ BuildRequires: desktop-file-utils BuildRequires: pkgconfig(libpanel-applet) %endif %if 0%{?xfce} || 0%{?mate} -BuildRequires: pkgconfig(gtk+-2.0) >= 2.6.0 +BuildRequires: pkgconfig(gtk+-3.0) %endif %if 0%{?xfce} -BuildRequires: pkgconfig(libxfce4panel-2.0) >= 4.4 +BuildRequires: pkgconfig(libxfce4panel-2.0) >= 4.12 %endif %if 0%{?mate} BuildRequires: pkgconfig(libmatepanelapplet-4.0) @@ -102,6 +105,8 @@ touch ChangeLog # https://bugzilla.redhat.com/show_bug.cgi?id=304121 sed -i -e '/^DISTRIBUTION_HOME/s/\/$//' frontend/gtkmm/src/Makefile.* +%patch0 -p1 + # upstream is python2 2to3 --write --nobackups libs/dbus/bin/dbusgen.py pathfix.py -pni %{__python3} libs/dbus/bin/dbusgen.py @@ -207,6 +212,9 @@ desktop-file-install \ %endif %changelog +* Mon Feb 08 2021 Mukundan Ragavan - 1.10.44-3 +- Build against xfce-4.16 + * Wed Jan 27 2021 Fedora Release Engineering - 1.10.44-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 94d761a1387cd4a6317c3d3900e76dccb98ce019 Mon Sep 17 00:00:00 2001 From: Mukundan Ragavan Date: Thu, 6 May 2021 21:07:01 -0400 Subject: [PATCH 52/90] update to 1.10.45 --- .gitignore | 1 + compile_against_xfce4-panel-4.15.patch | 31 -------------------------- sources | 2 +- workrave.spec | 12 +++++----- 4 files changed, 8 insertions(+), 38 deletions(-) delete mode 100644 compile_against_xfce4-panel-4.15.patch diff --git a/.gitignore b/.gitignore index 26ed692..df70071 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ workrave-1.9.1.tar.gz /workrave-v1_10_20.tar.gz /workrave-v1_10_37.tar.gz /workrave-v1_10_44.tar.gz +/workrave-v1_10_45.tar.gz diff --git a/compile_against_xfce4-panel-4.15.patch b/compile_against_xfce4-panel-4.15.patch deleted file mode 100644 index b6fb243..0000000 --- a/compile_against_xfce4-panel-4.15.patch +++ /dev/null @@ -1,31 +0,0 @@ -From c596e32ebe5a0a6ded3b583e8a78df729ffde2d5 Mon Sep 17 00:00:00 2001 -From: Rob Caelers -Date: Sun, 29 Nov 2020 14:54:58 +0100 -Subject: [PATCH] Fix XFCE applet for XFCE 4.15 - ---- - frontend/applets/xfce/src/main.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/frontend/applets/xfce/src/main.c b/frontend/applets/xfce/src/main.c -index 48b481b20..e49f0bc90 100644 ---- a/frontend/applets/xfce/src/main.c -+++ b/frontend/applets/xfce/src/main.c -@@ -20,7 +20,7 @@ - #endif - - #include --#include -+#include - - #include - -@@ -399,7 +399,7 @@ static void workrave_applet_fill(WorkraveApplet *applet) - - static void workrave_applet_construct(XfcePanelPlugin *plugin) - { -- WorkraveApplet *applet = panel_slice_new0(WorkraveApplet); -+ WorkraveApplet *applet = g_slice_new0(WorkraveApplet); - applet->plugin = plugin; - applet->image = NULL; - applet->timerbox_control = NULL; diff --git a/sources b/sources index 132e8ea..4f56dc8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (workrave-v1_10_44.tar.gz) = 582871be329fa67975d89206ebef9c4151e9b89eaab2848a1e113f91dd55cb2e5a80d790f9bd8195ab182eb95c99d3c3494da11673500b9680f2086a061e8d16 +SHA512 (workrave-v1_10_45.tar.gz) = 603f483024d87da738f1e2d649a78d7757120ad0ce97718afac8944238ce33dd5588f116834b839a0cbcff3d329ec6341ca8a107c92b3370beb84182fcbc125f diff --git a/workrave.spec b/workrave.spec index 5b3d965..76f9d90 100644 --- a/workrave.spec +++ b/workrave.spec @@ -3,8 +3,8 @@ %global xfce 1 Name: workrave -Version: 1.10.44 -Release: 3%{?dist} +Version: 1.10.45 +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+ @@ -12,9 +12,6 @@ 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 -# Upstream - https://github.com/rcaelers/workrave/commit/c596e32ebe5a0a6ded3b583e8a78df729ffde2d5 -Patch0: compile_against_xfce4-panel-4.15.patch - Obsoletes: %{name}-gtk2 < 1.10.37-1 Provides: %{name}-gtk2 = %{?epoch:%{epoch}:}%{version}-%{release} @@ -105,7 +102,6 @@ touch ChangeLog # https://bugzilla.redhat.com/show_bug.cgi?id=304121 sed -i -e '/^DISTRIBUTION_HOME/s/\/$//' frontend/gtkmm/src/Makefile.* -%patch0 -p1 # upstream is python2 2to3 --write --nobackups libs/dbus/bin/dbusgen.py @@ -212,6 +208,10 @@ desktop-file-install \ %endif %changelog +* Thu May 06 2021 Mukundan Ragavan - 1.10.45-1 +- Update to 1.10.45 +- Drop upstreamed patch + * Mon Feb 08 2021 Mukundan Ragavan - 1.10.44-3 - Build against xfce-4.16 From 27a2112bf257a5764f5b7b972992cdfd1772cada Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 21:07:59 +0000 Subject: [PATCH 53/90] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- workrave.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/workrave.spec b/workrave.spec index 76f9d90..e79c6e2 100644 --- a/workrave.spec +++ b/workrave.spec @@ -4,7 +4,7 @@ Name: workrave Version: 1.10.45 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Program that assists in the recovery and prevention of RSI # Based on older packages by Dag Wieers and Steve Ratcliffe License: GPLv3+ @@ -208,6 +208,9 @@ desktop-file-install \ %endif %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 1.10.45-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Thu May 06 2021 Mukundan Ragavan - 1.10.45-1 - Update to 1.10.45 - Drop upstreamed patch From ed74b12abcff8999bee226243be334e2bd359136 Mon Sep 17 00:00:00 2001 From: Mukundan Ragavan Date: Sun, 9 Jan 2022 07:46:50 -0600 Subject: [PATCH 54/90] Update to 1.10.49 Fixes rhbz#1986369 and rhbz#2035023 --- .gitignore | 1 + sources | 2 +- workrave.spec | 10 +++++++--- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index df70071..ba6b939 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ workrave-1.9.1.tar.gz /workrave-v1_10_37.tar.gz /workrave-v1_10_44.tar.gz /workrave-v1_10_45.tar.gz +/workrave-v1_10_49.tar.gz diff --git a/sources b/sources index 4f56dc8..e1982f4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (workrave-v1_10_45.tar.gz) = 603f483024d87da738f1e2d649a78d7757120ad0ce97718afac8944238ce33dd5588f116834b839a0cbcff3d329ec6341ca8a107c92b3370beb84182fcbc125f +SHA512 (workrave-v1_10_49.tar.gz) = 9e6d3b73b513139e444fccfbf6fcc45b495df3a43b86369a7a0d4b83c37c98bcdcce1452bc82d956230836038c09f96ea6d2da2dbeac64abd9ace620eace771b diff --git a/workrave.spec b/workrave.spec index e79c6e2..e2bb64a 100644 --- a/workrave.spec +++ b/workrave.spec @@ -3,8 +3,8 @@ %global xfce 1 Name: workrave -Version: 1.10.45 -Release: 2%{?dist} +Version: 1.10.49 +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+ @@ -196,7 +196,7 @@ desktop-file-install \ %if 0%{?xfce} %files xfce %{_libdir}/xfce4/panel/plugins/libworkrave-plugin.so -%{_datadir}/xfce4/panel-plugins/workrave-xfce-applet.desktop +%{_datadir}/xfce4/panel/plugins/workrave-xfce-applet.desktop %endif %if 0%{?mate} @@ -208,6 +208,10 @@ desktop-file-install \ %endif %changelog +* Sun Jan 09 2022 Mukundan Ragavan - 1.10.49-1 +- Update to 1.10.49 +- Fixes rhbz#1986369 and rhbz#2035023 + * Fri Jul 23 2021 Fedora Release Engineering - 1.10.45-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 8e0df145d28a617894cea6955bfa9714ce124ecb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 04:39:45 +0000 Subject: [PATCH 55/90] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- workrave.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/workrave.spec b/workrave.spec index e2bb64a..678f339 100644 --- a/workrave.spec +++ b/workrave.spec @@ -4,7 +4,7 @@ Name: workrave Version: 1.10.49 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Program that assists in the recovery and prevention of RSI # Based on older packages by Dag Wieers and Steve Ratcliffe License: GPLv3+ @@ -208,6 +208,9 @@ desktop-file-install \ %endif %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 1.10.49-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Sun Jan 09 2022 Mukundan Ragavan - 1.10.49-1 - Update to 1.10.49 - Fixes rhbz#1986369 and rhbz#2035023 From cceb78db7ce9c8be707243875a9fadfceaac13f3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 12:37:24 +0000 Subject: [PATCH 56/90] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- workrave.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/workrave.spec b/workrave.spec index 678f339..1fd2d6a 100644 --- a/workrave.spec +++ b/workrave.spec @@ -4,7 +4,7 @@ Name: workrave Version: 1.10.49 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Program that assists in the recovery and prevention of RSI # Based on older packages by Dag Wieers and Steve Ratcliffe License: GPLv3+ @@ -208,6 +208,9 @@ desktop-file-install \ %endif %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 1.10.49-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sat Jan 22 2022 Fedora Release Engineering - 1.10.49-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From d5f0460a183e3af235a817be5f9cbef3c3e0fd03 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Fri, 4 Nov 2022 13:06:04 -0400 Subject: [PATCH 57/90] Update to 1.10.50 * Enable GNOME Flashback applet * Support GNOME Shell 42 (#2132504) and 43 (#2132507) --- .gitignore | 1 + ...80d0982dd8f0dbe72574ae4758e6903691bb.patch | 23 +++++++++++++++++++ sources | 2 +- workrave.spec | 21 ++++++++++------- 4 files changed, 38 insertions(+), 9 deletions(-) create mode 100644 578180d0982dd8f0dbe72574ae4758e6903691bb.patch 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 From d2e58244dbfcf0effaa11a7c6bfa9a560a072bf1 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Fri, 4 Nov 2022 14:06:46 -0400 Subject: [PATCH 58/90] Fix unexpanded SPEC macros (#2091425) --- workrave.spec | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/workrave.spec b/workrave.spec index d02f21f..415c0f7 100644 --- a/workrave.spec +++ b/workrave.spec @@ -65,17 +65,19 @@ Recommends: gstreamer1-plugins-good %endif Obsoletes: %{name}-devel < %{version}-%{release} -%description -Workrave is a program that assists in the recovery and prevention of -Repetitive Strain Injury (RSI). The program frequently alerts you to +%global _description Workrave is a program that assists in the recovery and prevention of\ +Repetitive Strain Injury (RSI). The program frequently alerts you to\ take micro-pauses, rest breaks and restricts you to your daily limit. +%description +%{_description} + %package gnome-flashback Requires: %{name} = %{version}-%{release} Summary: Workrave applet for GNOME Flashback %description gnome-flashback -%{description} +%{_description} This package provides an applet for the GNOME Flashback panel. @@ -84,7 +86,7 @@ Requires: %{name} = %{version}-%{release} Summary: Workrave applet for MATE %description mate -%{description} +%{_description} This package provides an applet for the MATE panel. @@ -93,7 +95,7 @@ Requires: %{name} = %{version}-%{release} Summary: Workrave applet for Xfce %description xfce -%{description} +%{_description} This package provides an applet for the Xfce panel. From ac962ebca305abe4518a53bb8a10275a32dbaff6 Mon Sep 17 00:00:00 2001 From: Lumir Balhar Date: Tue, 1 Nov 2022 07:21:20 +0100 Subject: [PATCH 59/90] Change location of pathfix.py For more info see https://fedoraproject.org/wiki/Changes/Python3.12#pathfix.py_tool_will_be_removed --- workrave.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workrave.spec b/workrave.spec index 415c0f7..d5a8470 100644 --- a/workrave.spec +++ b/workrave.spec @@ -110,7 +110,7 @@ sed -i -e '/^DISTRIBUTION_HOME/s/\/$//' frontend/gtkmm/src/Makefile.* # upstream is python2 2to3 --write --nobackups libs/dbus/bin/dbusgen.py -pathfix.py -pni %{__python3} libs/dbus/bin/dbusgen.py +%{__python3} %{_rpmconfigdir}/redhat/pathfix.py -pni %{__python3} libs/dbus/bin/dbusgen.py sed -i 's/AC_CHECK_PROG(PYTHON, python, python)/AC_CHECK_PROG(PYTHON, python3, python3)/' configure.ac %build From 5dd241388f9d27f5535ed73adab93374630d3598 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 06:59:18 +0000 Subject: [PATCH 60/90] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- workrave.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/workrave.spec b/workrave.spec index d5a8470..895465a 100644 --- a/workrave.spec +++ b/workrave.spec @@ -4,7 +4,7 @@ Name: workrave Version: 1.10.50 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Program that assists in the recovery and prevention of RSI # Based on older packages by Dag Wieers and Steve Ratcliffe License: GPLv3+ @@ -210,6 +210,9 @@ desktop-file-install \ %endif %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 1.10.50-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Fri Nov 04 2022 Yaakov Selkowitz - 1.10.50-1 - Update to 1.10.50 - Enable GNOME Flashback applet From 561ce17f75a8a348b704e167248a553ffc33779d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 18:22:21 +0000 Subject: [PATCH 61/90] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- workrave.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/workrave.spec b/workrave.spec index 895465a..0ad8c29 100644 --- a/workrave.spec +++ b/workrave.spec @@ -4,7 +4,7 @@ Name: workrave Version: 1.10.50 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Program that assists in the recovery and prevention of RSI # Based on older packages by Dag Wieers and Steve Ratcliffe License: GPLv3+ @@ -210,6 +210,9 @@ desktop-file-install \ %endif %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 1.10.50-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Sat Jan 21 2023 Fedora Release Engineering - 1.10.50-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From d994a23ca4adba1ebb5237c9c3892fab1cf5b7c1 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Mon, 28 Aug 2023 21:16:32 -0400 Subject: [PATCH 62/90] Convert to %autorelease and %autochangelog [skip changelog] --- changelog | 227 +++++++++++++++++++++++++++++++++++++++++++++++++ workrave.spec | 230 +------------------------------------------------- 2 files changed, 229 insertions(+), 228 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..f929c6f --- /dev/null +++ b/changelog @@ -0,0 +1,227 @@ +* Sat Jul 22 2023 Fedora Release Engineering - 1.10.50-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Sat Jan 21 2023 Fedora Release Engineering - 1.10.50-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* 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 + +* Sat Jan 22 2022 Fedora Release Engineering - 1.10.49-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Sun Jan 09 2022 Mukundan Ragavan - 1.10.49-1 +- Update to 1.10.49 +- Fixes rhbz#1986369 and rhbz#2035023 + +* Fri Jul 23 2021 Fedora Release Engineering - 1.10.45-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Thu May 06 2021 Mukundan Ragavan - 1.10.45-1 +- Update to 1.10.45 +- Drop upstreamed patch + +* Mon Feb 08 2021 Mukundan Ragavan - 1.10.44-3 +- Build against xfce-4.16 + +* Wed Jan 27 2021 Fedora Release Engineering - 1.10.44-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Fri Oct 02 2020 Lukas Zapletal - 1.10.44-1 +- new version + +* Wed Jul 29 2020 Fedora Release Engineering - 1.10.37-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Mar 27 2020 Lukas Zapletal - 1.10.37-1 +- new version + +* Fri Jan 31 2020 Fedora Release Engineering - 1.10.20-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Sat Jul 27 2019 Fedora Release Engineering - 1.10.20-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri Apr 12 2019 Lukas Zapletal - 1.10.20-5 +- Updated X11 and python3 deps + +* Sun Feb 03 2019 Fedora Release Engineering - 1.10.20-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sat Jul 14 2018 Fedora Release Engineering - 1.10.20-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Fri Feb 09 2018 Fedora Release Engineering - 1.10.20-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Tue Nov 14 2017 Yaakov Selkowitz - 1.10.20-1 +- new version (#1508256) + +* Thu Aug 03 2017 Fedora Release Engineering - 1.10.16-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 1.10.16-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat Feb 11 2017 Fedora Release Engineering - 1.10.16-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Fri Sep 16 2016 Yaakov Selkowitz - 1.10.16-1 +- new version (#1376625) + +* Thu May 12 2016 Yaakov Selkowitz - 1.10.15-1 +- new version (#1321458) + +* Fri Feb 26 2016 Yaakov Selkowitz - 1.10.10-1 +- new version +- Add Cinnamon, Indicator, MATE, Xfce applets +- Cleanup spec + +* Fri Feb 05 2016 Fedora Release Engineering - 1.10-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Fri Jun 19 2015 Fedora Release Engineering - 1.10-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sat May 02 2015 Kalev Lember - 1.10-8 +- Rebuilt for GCC 5 C++11 ABI change + +* Mon Aug 18 2014 Fedora Release Engineering - 1.10-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Tue Jul 22 2014 Kalev Lember - 1.10-6 +- Rebuilt for gobject-introspection 1.41.4 + +* Sun Jun 08 2014 Fedora Release Engineering - 1.10-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Sun Aug 04 2013 Fedora Release Engineering - 1.10-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Fri May 3 2013 Tomáš Mráz - 1.10-3 +- do not build the panel applet + +* Mon Mar 25 2013 Peter Robinson 1.10-2 +- Add missing distag + +* Tue Feb 19 2013 Tomáš Mráz - 1.10-1 +- new upstream release + +* Fri Feb 8 2013 Tomáš Mráz - 1.9.911-0.2.20130107git6f9bc5d +- drop --vendor from desktop-file-install call + +* Tue Jan 8 2013 Tom Callaway - 1.9.911-0.1.20130107git6f9bc5d +- update to 1.9.911 checkout from github +- build for gnome3 + +* Sun Jul 22 2012 Fedora Release Engineering - 1.9.4-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Tue Feb 28 2012 Fedora Release Engineering - 1.9.4-5 +- Rebuilt for c++ ABI breakage + +* Sat Jan 14 2012 Fedora Release Engineering - 1.9.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Mon Nov 7 2011 Tomas Mraz - 1.9.4-3 +- rebuilt with new libpng + +* Tue Jun 28 2011 Tomas Mraz - 1.9.4-2 +- no longer needs gnet2 + +* Wed Apr 06 2011 Rahul Sundaram - 1.9.4-1 +- New upstream bug fix release. Closes rhbz#693958 +- https://github.com/rcaelers/workrave/blob/b491d9b5054b5571d5b4ff0f6c9137133735129d/NEWS +- Drop buildroot definition and clean section + +* Thu Feb 10 2011 Tomas Mraz - 1.9.3-4 +- due to changes in gnome applet API we have to build without + gnome support + +* Mon Feb 07 2011 Fedora Release Engineering - 1.9.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Thu Feb 3 2011 Tomas Mraz - 1.9.3-2 +- rebuilt with new gnome-panel + +* Fri Dec 17 2010 Tomas Mraz - 1.9.3-1 +- new upstream release with bug fixes and usability improvements + +* Wed Nov 3 2010 Tomas Mraz - 1.9.2-1 +- new upstream release hopefully fixing at least some of the aborts + +* Mon Apr 26 2010 Tomas Mraz - 1.9.1-4 +- better guard for BadWindow errors in input monitor (#566156) + +* Wed Mar 17 2010 Tomas Mraz - 1.9.1-3 +- fix FTBFS (#564917) + +* Thu Jan 28 2010 Tomas Mraz - 1.9.1-2 +- do not build against gdome2 - not too useful optional feature + +* Tue Dec 8 2009 Tomas Mraz - 1.9.1-1 +- new upstream version + +* Mon Jul 27 2009 Fedora Release Engineering - 1.9.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Fri Feb 27 2009 Tomas Mraz - 1.9.0-3 +- fix build with new gcc 4.4 and glibc + +* Fri Sep 26 2008 Tomas Mraz - 1.9.0-1 +- new upstream version + +* Fri Apr 4 2008 Tomas Mraz - 1.8.5-4 +- fix locking/unlocking with gnome-screensaver (#207058) +- make it build with current libsigc++ + +* Wed Feb 20 2008 Fedora Release Engineering - 1.8.5-3 +- Autorebuild for GCC 4.3 + +* Tue Feb 19 2008 Tomas Mraz - 1.8.5-2 +- make it build on gcc-4.3 + +* Mon Jan 7 2008 Tomas Mraz - 1.8.5-1 +- upgrade to latest upstream version + +* Wed Aug 22 2007 Tomas Mraz - 1.8.4-4 +- applet counters don't start properly +- license tag fix + +* Wed Apr 18 2007 Tomas Mraz - 1.8.4-3 +- fixed applet crash (#236543) + +* Mon Mar 26 2007 Tomas Mraz - 1.8.4-2 +- new upstream version +- add datadir/pixmaps/workrave to files (#233815) + +* Thu Sep 7 2006 Tomas Mraz - 1.8.3-2 +- rebuilt for FC6 + +* Wed May 31 2006 Tomas Mraz - 1.8.3-1 +- New upstream version + +* Wed Feb 15 2006 Tomas Mraz - 1.8.2-2 +- Rebuilt with updated gcc + +* Thu Feb 2 2006 Tomas Mraz - 1.8.2-1 +- Updated version, dropped obsolete patch +- Added missing buildrequires for modular X +- Fixed compilation on gcc-4.1 + +* Sat Oct 22 2005 Tomas Mraz - 1.8.1-4 +- Added a desktop file +- Added find_lang +- Fixed wrong install extension for message translations + +* Thu Oct 20 2005 Tomas Mraz - 1.8.1-3 +- Removed Prefix:, added BuildRequires gnome-panel-devel +- Group: Applications/Productivity + +* Thu Sep 22 2005 Tomas Mraz - 1.8.1-2 +- Initial package, reused spec from package by Steve Ratcliffe diff --git a/workrave.spec b/workrave.spec index 0ad8c29..ead7fa3 100644 --- a/workrave.spec +++ b/workrave.spec @@ -4,7 +4,7 @@ Name: workrave Version: 1.10.50 -Release: 3%{?dist} +Release: %autorelease Summary: Program that assists in the recovery and prevention of RSI # Based on older packages by Dag Wieers and Steve Ratcliffe License: GPLv3+ @@ -210,230 +210,4 @@ desktop-file-install \ %endif %changelog -* Sat Jul 22 2023 Fedora Release Engineering - 1.10.50-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Sat Jan 21 2023 Fedora Release Engineering - 1.10.50-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* 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 - -* Sat Jan 22 2022 Fedora Release Engineering - 1.10.49-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Sun Jan 09 2022 Mukundan Ragavan - 1.10.49-1 -- Update to 1.10.49 -- Fixes rhbz#1986369 and rhbz#2035023 - -* Fri Jul 23 2021 Fedora Release Engineering - 1.10.45-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Thu May 06 2021 Mukundan Ragavan - 1.10.45-1 -- Update to 1.10.45 -- Drop upstreamed patch - -* Mon Feb 08 2021 Mukundan Ragavan - 1.10.44-3 -- Build against xfce-4.16 - -* Wed Jan 27 2021 Fedora Release Engineering - 1.10.44-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Fri Oct 02 2020 Lukas Zapletal - 1.10.44-1 -- new version - -* Wed Jul 29 2020 Fedora Release Engineering - 1.10.37-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Fri Mar 27 2020 Lukas Zapletal - 1.10.37-1 -- new version - -* Fri Jan 31 2020 Fedora Release Engineering - 1.10.20-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Sat Jul 27 2019 Fedora Release Engineering - 1.10.20-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri Apr 12 2019 Lukas Zapletal - 1.10.20-5 -- Updated X11 and python3 deps - -* Sun Feb 03 2019 Fedora Release Engineering - 1.10.20-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Sat Jul 14 2018 Fedora Release Engineering - 1.10.20-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Fri Feb 09 2018 Fedora Release Engineering - 1.10.20-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Tue Nov 14 2017 Yaakov Selkowitz - 1.10.20-1 -- new version (#1508256) - -* Thu Aug 03 2017 Fedora Release Engineering - 1.10.16-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 1.10.16-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Feb 11 2017 Fedora Release Engineering - 1.10.16-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Fri Sep 16 2016 Yaakov Selkowitz - 1.10.16-1 -- new version (#1376625) - -* Thu May 12 2016 Yaakov Selkowitz - 1.10.15-1 -- new version (#1321458) - -* Fri Feb 26 2016 Yaakov Selkowitz - 1.10.10-1 -- new version -- Add Cinnamon, Indicator, MATE, Xfce applets -- Cleanup spec - -* Fri Feb 05 2016 Fedora Release Engineering - 1.10-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Fri Jun 19 2015 Fedora Release Engineering - 1.10-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sat May 02 2015 Kalev Lember - 1.10-8 -- Rebuilt for GCC 5 C++11 ABI change - -* Mon Aug 18 2014 Fedora Release Engineering - 1.10-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Tue Jul 22 2014 Kalev Lember - 1.10-6 -- Rebuilt for gobject-introspection 1.41.4 - -* Sun Jun 08 2014 Fedora Release Engineering - 1.10-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Sun Aug 04 2013 Fedora Release Engineering - 1.10-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Fri May 3 2013 Tomáš Mráz - 1.10-3 -- do not build the panel applet - -* Mon Mar 25 2013 Peter Robinson 1.10-2 -- Add missing distag - -* Tue Feb 19 2013 Tomáš Mráz - 1.10-1 -- new upstream release - -* Fri Feb 8 2013 Tomáš Mráz - 1.9.911-0.2.20130107git6f9bc5d -- drop --vendor from desktop-file-install call - -* Tue Jan 8 2013 Tom Callaway - 1.9.911-0.1.20130107git6f9bc5d -- update to 1.9.911 checkout from github -- build for gnome3 - -* Sun Jul 22 2012 Fedora Release Engineering - 1.9.4-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Tue Feb 28 2012 Fedora Release Engineering - 1.9.4-5 -- Rebuilt for c++ ABI breakage - -* Sat Jan 14 2012 Fedora Release Engineering - 1.9.4-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Mon Nov 7 2011 Tomas Mraz - 1.9.4-3 -- rebuilt with new libpng - -* Tue Jun 28 2011 Tomas Mraz - 1.9.4-2 -- no longer needs gnet2 - -* Wed Apr 06 2011 Rahul Sundaram - 1.9.4-1 -- New upstream bug fix release. Closes rhbz#693958 -- https://github.com/rcaelers/workrave/blob/b491d9b5054b5571d5b4ff0f6c9137133735129d/NEWS -- Drop buildroot definition and clean section - -* Thu Feb 10 2011 Tomas Mraz - 1.9.3-4 -- due to changes in gnome applet API we have to build without - gnome support - -* Mon Feb 07 2011 Fedora Release Engineering - 1.9.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Thu Feb 3 2011 Tomas Mraz - 1.9.3-2 -- rebuilt with new gnome-panel - -* Fri Dec 17 2010 Tomas Mraz - 1.9.3-1 -- new upstream release with bug fixes and usability improvements - -* Wed Nov 3 2010 Tomas Mraz - 1.9.2-1 -- new upstream release hopefully fixing at least some of the aborts - -* Mon Apr 26 2010 Tomas Mraz - 1.9.1-4 -- better guard for BadWindow errors in input monitor (#566156) - -* Wed Mar 17 2010 Tomas Mraz - 1.9.1-3 -- fix FTBFS (#564917) - -* Thu Jan 28 2010 Tomas Mraz - 1.9.1-2 -- do not build against gdome2 - not too useful optional feature - -* Tue Dec 8 2009 Tomas Mraz - 1.9.1-1 -- new upstream version - -* Mon Jul 27 2009 Fedora Release Engineering - 1.9.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Fri Feb 27 2009 Tomas Mraz - 1.9.0-3 -- fix build with new gcc 4.4 and glibc - -* Fri Sep 26 2008 Tomas Mraz - 1.9.0-1 -- new upstream version - -* Fri Apr 4 2008 Tomas Mraz - 1.8.5-4 -- fix locking/unlocking with gnome-screensaver (#207058) -- make it build with current libsigc++ - -* Wed Feb 20 2008 Fedora Release Engineering - 1.8.5-3 -- Autorebuild for GCC 4.3 - -* Tue Feb 19 2008 Tomas Mraz - 1.8.5-2 -- make it build on gcc-4.3 - -* Mon Jan 7 2008 Tomas Mraz - 1.8.5-1 -- upgrade to latest upstream version - -* Wed Aug 22 2007 Tomas Mraz - 1.8.4-4 -- applet counters don't start properly -- license tag fix - -* Wed Apr 18 2007 Tomas Mraz - 1.8.4-3 -- fixed applet crash (#236543) - -* Mon Mar 26 2007 Tomas Mraz - 1.8.4-2 -- new upstream version -- add datadir/pixmaps/workrave to files (#233815) - -* Thu Sep 7 2006 Tomas Mraz - 1.8.3-2 -- rebuilt for FC6 - -* Wed May 31 2006 Tomas Mraz - 1.8.3-1 -- New upstream version - -* Wed Feb 15 2006 Tomas Mraz - 1.8.2-2 -- Rebuilt with updated gcc - -* Thu Feb 2 2006 Tomas Mraz - 1.8.2-1 -- Updated version, dropped obsolete patch -- Added missing buildrequires for modular X -- Fixed compilation on gcc-4.1 - -* Sat Oct 22 2005 Tomas Mraz - 1.8.1-4 -- Added a desktop file -- Added find_lang -- Fixed wrong install extension for message translations - -* Thu Oct 20 2005 Tomas Mraz - 1.8.1-3 -- Removed Prefix:, added BuildRequires gnome-panel-devel -- Group: Applications/Productivity - -* Thu Sep 22 2005 Tomas Mraz - 1.8.1-2 -- Initial package, reused spec from package by Steve Ratcliffe +%autochangelog From 63167a9d0ecddf686b4445f45f58661846f4e159 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Mon, 28 Aug 2023 21:34:26 -0400 Subject: [PATCH 63/90] Cleanup spec --- workrave.spec | 80 ++++++++++++++++++++++++--------------------------- 1 file changed, 37 insertions(+), 43 deletions(-) diff --git a/workrave.spec b/workrave.spec index ead7fa3..83a3074 100644 --- a/workrave.spec +++ b/workrave.spec @@ -1,21 +1,19 @@ -%global gnome_flashback 1 -%global mate 1 -%global xfce 1 +%bcond gnome_flashback 1 +%bcond mate 1 +%bcond xfce 1 -Name: workrave -Version: 1.10.50 -Release: %autorelease -Summary: Program that assists in the recovery and prevention of RSI +Name: workrave +Version: 1.10.50 +Release: %autorelease +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/ +License: GPL-3.0-or-later +URL: https://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 +Source0: https://github.com/rcaelers/workrave/archive/v%{tag}/%{name}-v%{tag}.tar.gz -Obsoletes: %{name}-gtk2 < 1.10.37-1 -Provides: %{name}-gtk2 = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: %{name}-gtk2 < 1.10.37-1 +Provides: %{name}-gtk2 = %{?epoch:%{epoch}:}%{version}-%{release} BuildRequires: make BuildRequires: gcc-c++ @@ -45,25 +43,25 @@ BuildRequires: gettext BuildRequires: intltool BuildRequires: autoconf, automake, libtool, autoconf-archive BuildRequires: desktop-file-utils -%if 0%{?gnome_flashback} +%if %{with gnome_flashback} BuildRequires: pkgconfig(libgnome-panel) %endif -%if 0%{?xfce} || 0%{?mate} +%if %{with xfce} || %{with mate} BuildRequires: pkgconfig(gtk+-3.0) %endif -%if 0%{?xfce} +%if %{with xfce} BuildRequires: pkgconfig(libxfce4panel-2.0) >= 4.12 %endif -%if 0%{?mate} +%if %{with mate} BuildRequires: pkgconfig(libmatepanelapplet-4.0) %endif -Requires: dbus -%if 0%{?fedora} -Recommends: gstreamer1-plugins-base -Recommends: gstreamer1-plugins-good +Requires: dbus +%if %{defined fedora} +Recommends: gstreamer1-plugins-base +Recommends: gstreamer1-plugins-good %endif -Obsoletes: %{name}-devel < %{version}-%{release} +Obsoletes: %{name}-devel < %{version}-%{release} %global _description Workrave is a program that assists in the recovery and prevention of\ Repetitive Strain Injury (RSI). The program frequently alerts you to\ @@ -73,8 +71,8 @@ take micro-pauses, rest breaks and restricts you to your daily limit. %{_description} %package gnome-flashback -Requires: %{name} = %{version}-%{release} -Summary: Workrave applet for GNOME Flashback +Requires: %{name} = %{version}-%{release} +Summary: Workrave applet for GNOME Flashback %description gnome-flashback %{_description} @@ -82,8 +80,8 @@ Summary: Workrave applet for GNOME Flashback This package provides an applet for the GNOME Flashback panel. %package mate -Requires: %{name} = %{version}-%{release} -Summary: Workrave applet for MATE +Requires: %{name} = %{version}-%{release} +Summary: Workrave applet for MATE %description mate %{_description} @@ -91,8 +89,8 @@ Summary: Workrave applet for MATE This package provides an applet for the MATE panel. %package xfce -Requires: %{name} = %{version}-%{release} -Summary: Workrave applet for Xfce +Requires: %{name} = %{version}-%{release} +Summary: Workrave applet for Xfce %description xfce %{_description} @@ -101,8 +99,7 @@ This package provides an applet for the Xfce panel. %prep -%setup -q -n workrave-%{tag} -%patch0 -p1 +%autosetup -n workrave-%{tag} -p1 touch ChangeLog # https://bugzilla.redhat.com/show_bug.cgi?id=304121 sed -i -e '/^DISTRIBUTION_HOME/s/\/$//' frontend/gtkmm/src/Makefile.* @@ -121,27 +118,27 @@ fi # gnome3 is flashback panel applet, not gnome-shell %configure \ -%if 0%{?gnome_flashback} +%if %{with gnome_flashback} --enable-gnome3 \ %else --disable-gnome3 \ %endif -%if 0%{?mate} +%if %{with mate} --enable-mate \ %else --disable-mate \ %endif -%if 0%{?xfce} +%if %{with xfce} --enable-xfce \ %else --disable-xfce \ %endif --disable-static --disable-xml -make V=1 %{_smp_mflags} +%make_build %install -make install DESTDIR=%{buildroot} +%make_install find %{buildroot} -name '*.la' -delete # workrave does not provide a public API @@ -150,10 +147,7 @@ rm -f %{buildroot}%{_libdir}/*.so %find_lang %{name} -desktop-file-install \ - --dir %{buildroot}%{_datadir}/applications \ - --delete-original \ - %{buildroot}%{_datadir}/applications/%{name}.desktop +desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop %files -f %{name}.lang @@ -190,18 +184,18 @@ desktop-file-install \ %dir %{_libdir}/indicators3/7/ %{_libdir}/indicators3/7/libworkrave.so -%if 0%{?gnome_flashback} +%if %{with gnome_flashback} %files gnome-flashback %{_libdir}/gnome-panel/modules/libworkrave-applet.so %endif -%if 0%{?xfce} +%if %{with xfce} %files xfce %{_libdir}/xfce4/panel/plugins/libworkrave-plugin.so %{_datadir}/xfce4/panel/plugins/workrave-xfce-applet.desktop %endif -%if 0%{?mate} +%if %{with mate} %files mate %{_libdir}/mate-applets/workrave-applet %{_datadir}/dbus-1/services/org.mate.panel.applet.WorkraveAppletFactory.service From 07754c565e31f73e2a3d28d709264047e3f738c4 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Mon, 28 Aug 2023 22:19:46 -0400 Subject: [PATCH 64/90] Update to 1.10.51.1 --- workrave.spec | 60 +++++++++++++++++++++++++++++++++++---------------- 1 file changed, 41 insertions(+), 19 deletions(-) diff --git a/workrave.spec b/workrave.spec index 83a3074..50c603e 100644 --- a/workrave.spec +++ b/workrave.spec @@ -1,13 +1,14 @@ +%bcond gnome 1 %bcond gnome_flashback 1 %bcond mate 1 %bcond xfce 1 Name: workrave -Version: 1.10.50 +Version: 1.10.51.1 Release: %autorelease Summary: Program that assists in the recovery and prevention of RSI # Based on older packages by Dag Wieers and Steve Ratcliffe -License: GPL-3.0-or-later +License: GPL-3.0-or-later AND LGPL-2.0-or-later URL: https://workrave.org/ %global tag %(echo %{version} | sed -e 's/\\./_/g') Source0: https://github.com/rcaelers/workrave/archive/v%{tag}/%{name}-v%{tag}.tar.gz @@ -28,9 +29,6 @@ BuildRequires: pkgconfig(sigc++-2.0) >= 2.2.4.2 BuildRequires: pkgconfig(glibmm-2.4) >= 2.28.0 BuildRequires: pkgconfig(gtkmm-3.0) >= 3.0.0 BuildRequires: gobject-introspection-devel >= 0.6.7 -BuildRequires: pkgconfig(indicator3-0.4) >= 0.3.19 -BuildRequires: pkgconfig(dbusmenu-glib-0.4) >= 0.1.1 -BuildRequires: pkgconfig(dbusmenu-gtk3-0.4) >= 0.3.95 BuildRequires: boost-devel BuildRequires: python3 BuildRequires: python3-devel @@ -46,8 +44,8 @@ BuildRequires: desktop-file-utils %if %{with gnome_flashback} BuildRequires: pkgconfig(libgnome-panel) %endif -%if %{with xfce} || %{with mate} -BuildRequires: pkgconfig(gtk+-3.0) +%if %{with gnome} +BuildRequires: pkgconfig(gtk4) %endif %if %{with xfce} BuildRequires: pkgconfig(libxfce4panel-2.0) >= 4.12 @@ -56,11 +54,14 @@ BuildRequires: pkgconfig(libxfce4panel-2.0) >= 4.12 BuildRequires: pkgconfig(libmatepanelapplet-4.0) %endif -Requires: dbus -%if %{defined fedora} +Requires: dbus-common +Recommends: (%{name}-cinnamon if cinnamon) +Recommends: (%{name}-gnome if gnome-shell) +Recommends: (%{name}-gnome-flashback if gnome-panel) +Recommends: (%{name}-mate if mate-panel) +Recommends: (%{name}-xfce if xfce4-panel) Recommends: gstreamer1-plugins-base Recommends: gstreamer1-plugins-good -%endif Obsoletes: %{name}-devel < %{version}-%{release} %global _description Workrave is a program that assists in the recovery and prevention of\ @@ -70,6 +71,24 @@ take micro-pauses, rest breaks and restricts you to your daily limit. %description %{_description} +%package cinnamon +Requires: %{name} = %{version}-%{release} +Summary: Workrave applet for Cinnamon desktop + +%description cinnamon +%{_description} + +This package provides an applet for the Cinnamon desktop. + +%package gnome +Requires: %{name} = %{version}-%{release} +Summary: Workrave applet for GNOME desktop + +%description gnome +%{_description} + +This package provides an applet for the GNOME desktop. + %package gnome-flashback Requires: %{name} = %{version}-%{release} Summary: Workrave applet for GNOME Flashback @@ -133,6 +152,7 @@ fi %else --disable-xfce \ %endif + --disable-indicator \ --disable-static --disable-xml %make_build @@ -171,18 +191,20 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop # support library for gtk3 applets %{_libdir}/girepository-1.0/Workrave-1.0.typelib %{_libdir}/libworkrave-private-1.0.so.* -# gnome-shell extension -%dir %{_datadir}/gnome-shell/ -%dir %{_datadir}/gnome-shell/extensions/ -%{_datadir}/gnome-shell/extensions/workrave@workrave.org/ -# cinnamon applet + +%files cinnamon %dir %{_datadir}/cinnamon/ %dir %{_datadir}/cinnamon/applets/ %{_datadir}/cinnamon/applets/workrave@workrave.org/ -# indicator applet -%dir %{_libdir}/indicators3/ -%dir %{_libdir}/indicators3/7/ -%{_libdir}/indicators3/7/libworkrave.so + +%if %{with gnome} +%files gnome +%{_libdir}/girepository-1.0/Workrave-2.0.typelib +%{_libdir}/libworkrave-gtk4-private-1.0.so.* +%dir %{_datadir}/gnome-shell/ +%dir %{_datadir}/gnome-shell/extensions/ +%{_datadir}/gnome-shell/extensions/workrave@workrave.org/ +%endif %if %{with gnome_flashback} %files gnome-flashback From 130a11b685b460f02f42663db8a4563fd93f0a91 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Mon, 28 Aug 2023 23:13:57 -0400 Subject: [PATCH 65/90] Upload sources [skip changelog] --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 3f69983..04b6aa2 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ workrave-1.9.1.tar.gz /workrave-v1_10_45.tar.gz /workrave-v1_10_49.tar.gz /workrave-v1_10_50.tar.gz +/workrave-v1_10_51_1.tar.gz diff --git a/sources b/sources index 45d2d7f..517fb40 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (workrave-v1_10_50.tar.gz) = ccc985518aab06e31447ac9a16f4a39dfae077be581706b4ac88392e4d5e993f32b2bdc5697d7540785d5ebd6f1d31339d5dc1a5f7b6241da44a4e61cce021da +SHA512 (workrave-v1_10_51_1.tar.gz) = 0c46ce08ca6234d2bf25d1959692afdc86c769746cba37077062ffed6d044eb55cfff9c162106f9d7021438d744eaf0ea3a5c92cacdb79bb65ce1b629022b1ac From 06e5a16b08fbe28c4bb146a6f5daf24b6e29ede2 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Sun, 10 Sep 2023 23:12:41 -0400 Subject: [PATCH 66/90] Rebuilt for gnome-panel-3.49.1 From 2106956ef5a9ab2e55a8d75e24caf1a9de4e13b5 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Sun, 10 Sep 2023 23:24:37 -0400 Subject: [PATCH 67/90] https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval --- workrave.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/workrave.spec b/workrave.spec index 50c603e..ee7d1da 100644 --- a/workrave.spec +++ b/workrave.spec @@ -64,6 +64,9 @@ Recommends: gstreamer1-plugins-base Recommends: gstreamer1-plugins-good Obsoletes: %{name}-devel < %{version}-%{release} +# https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval +ExcludeArch: %{ix86} + %global _description Workrave is a program that assists in the recovery and prevention of\ Repetitive Strain Injury (RSI). The program frequently alerts you to\ take micro-pauses, rest breaks and restricts you to your daily limit. From 52f0458408e17f765dec2b24f9d2a0e85bb2e2ca Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Fri, 20 Oct 2023 15:17:59 -0400 Subject: [PATCH 68/90] Drop 2to3 usage This script was already ported to Python 3 since 1.10.32: https://github.com/rcaelers/workrave/commit/83f7682da3797ad1fa0caf1f94e90915b78068e4 --- workrave.spec | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/workrave.spec b/workrave.spec index ee7d1da..5737020 100644 --- a/workrave.spec +++ b/workrave.spec @@ -127,9 +127,8 @@ touch ChangeLog sed -i -e '/^DISTRIBUTION_HOME/s/\/$//' frontend/gtkmm/src/Makefile.* -# upstream is python2 -2to3 --write --nobackups libs/dbus/bin/dbusgen.py -%{__python3} %{_rpmconfigdir}/redhat/pathfix.py -pni %{__python3} libs/dbus/bin/dbusgen.py +# use versioned python command +%py3_shebang_fix libs/dbus/bin/dbusgen.py sed -i 's/AC_CHECK_PROG(PYTHON, python, python)/AC_CHECK_PROG(PYTHON, python3, python3)/' configure.ac %build From f7bf24be1bb99d500d10fd6eb2e3427cd7d87cfc Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Sun, 17 Dec 2023 18:51:32 -0500 Subject: [PATCH 69/90] 1.10.52 Resolves: rhbz#2254906 --- .gitignore | 1 + ...80d0982dd8f0dbe72574ae4758e6903691bb.patch | 23 ------------------- sources | 2 +- workrave.spec | 6 ++++- 4 files changed, 7 insertions(+), 25 deletions(-) delete mode 100644 578180d0982dd8f0dbe72574ae4758e6903691bb.patch diff --git a/.gitignore b/.gitignore index 04b6aa2..86fe057 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ workrave-1.9.1.tar.gz /workrave-v1_10_49.tar.gz /workrave-v1_10_50.tar.gz /workrave-v1_10_51_1.tar.gz +/workrave-v1_10_52.tar.gz diff --git a/578180d0982dd8f0dbe72574ae4758e6903691bb.patch b/578180d0982dd8f0dbe72574ae4758e6903691bb.patch deleted file mode 100644 index 91aa3a2..0000000 --- a/578180d0982dd8f0dbe72574ae4758e6903691bb.patch +++ /dev/null @@ -1,23 +0,0 @@ -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 517fb40..3527af4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (workrave-v1_10_51_1.tar.gz) = 0c46ce08ca6234d2bf25d1959692afdc86c769746cba37077062ffed6d044eb55cfff9c162106f9d7021438d744eaf0ea3a5c92cacdb79bb65ce1b629022b1ac +SHA512 (workrave-v1_10_52.tar.gz) = 4e64e4ef3bbf11e397af6c8086265ab4a628d05648e3662651d25079299e3016bd97c186fc069621121ab889ee22a1c58793fe81fc7fe4b6e4e1ebc7575993e8 diff --git a/workrave.spec b/workrave.spec index 5737020..1680cbe 100644 --- a/workrave.spec +++ b/workrave.spec @@ -1,10 +1,11 @@ %bcond gnome 1 +%bcond gnome45 %[0%{?fedora} >= 39 || 0%{?rhel} >= 10] %bcond gnome_flashback 1 %bcond mate 1 %bcond xfce 1 Name: workrave -Version: 1.10.51.1 +Version: 1.10.52 Release: %autorelease Summary: Program that assists in the recovery and prevention of RSI # Based on older packages by Dag Wieers and Steve Ratcliffe @@ -144,6 +145,9 @@ fi %else --disable-gnome3 \ %endif +%if %{with gnome45} + --enable-gnome45 \ +%endif %if %{with mate} --enable-mate \ %else From f4d1eaa46ca02dec969275567b805e91813b085e Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Mon, 22 Jan 2024 13:46:10 -0500 Subject: [PATCH 70/90] Fix EPEL compatibility --- workrave.spec | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/workrave.spec b/workrave.spec index 1680cbe..b40ddd5 100644 --- a/workrave.spec +++ b/workrave.spec @@ -1,8 +1,18 @@ +%if 0%{?fedora} || 0%{?rhel} >= 9 %bcond gnome 1 +%bcond gnome40 1 %bcond gnome45 %[0%{?fedora} >= 39 || 0%{?rhel} >= 10] %bcond gnome_flashback 1 %bcond mate 1 %bcond xfce 1 +%else +%bcond_without gnome +%bcond_with gnome40 +%bcond_with gnome45 +%bcond_with gnome_flashback +%bcond_without mate +%bcond_without xfce +%endif Name: workrave Version: 1.10.52 @@ -23,6 +33,7 @@ BuildRequires: libX11-devel BuildRequires: libXScrnSaver-devel BuildRequires: pkgconfig(ice) BuildRequires: pkgconfig(sm) +BuildRequires: pkgconfig(xtst) BuildRequires: pkgconfig(glib-2.0) >= 2.28.0 BuildRequires: pkgconfig(gio-2.0) >= 2.26.0 BuildRequires: pkgconfig(gtk+-3.0) >= 3.0.0 @@ -45,7 +56,7 @@ BuildRequires: desktop-file-utils %if %{with gnome_flashback} BuildRequires: pkgconfig(libgnome-panel) %endif -%if %{with gnome} +%if %{with gnome40} BuildRequires: pkgconfig(gtk4) %endif %if %{with xfce} @@ -205,8 +216,10 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop %if %{with gnome} %files gnome +%if %{with gnome40} %{_libdir}/girepository-1.0/Workrave-2.0.typelib %{_libdir}/libworkrave-gtk4-private-1.0.so.* +%endif %dir %{_datadir}/gnome-shell/ %dir %{_datadir}/gnome-shell/extensions/ %{_datadir}/gnome-shell/extensions/workrave@workrave.org/ From c654c0e8c7d1b50d3546aea571e8f08bc51f4ecd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 09:05:58 +0000 Subject: [PATCH 71/90] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 61327945cc96e1b07bc330c30ca378af0318dd43 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Wed, 27 Mar 2024 19:18:40 -0400 Subject: [PATCH 72/90] Rebuilt for gnome-panel 3.52.0 From 18034c3c8a701ddabbdfe0edccd54eac0c75580c Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Thu, 30 May 2024 20:51:08 -0400 Subject: [PATCH 73/90] 1.11.0~beta.12 This version includes support for Wayland as well as GNOME 46. Resolves: rhbz#1956023 Resolves: rhbz#2266234 Resolves: rhbz#2280850 --- .gitignore | 1 + sources | 2 +- workrave.spec | 164 ++++++++++++++++++++++---------------------------- 3 files changed, 73 insertions(+), 94 deletions(-) diff --git a/.gitignore b/.gitignore index 86fe057..86f023d 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ workrave-1.9.1.tar.gz /workrave-v1_10_50.tar.gz /workrave-v1_10_51_1.tar.gz /workrave-v1_10_52.tar.gz +/workrave-v1_11_0_beta_12.tar.gz diff --git a/sources b/sources index 3527af4..b945f73 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (workrave-v1_10_52.tar.gz) = 4e64e4ef3bbf11e397af6c8086265ab4a628d05648e3662651d25079299e3016bd97c186fc069621121ab889ee22a1c58793fe81fc7fe4b6e4e1ebc7575993e8 +SHA512 (workrave-v1_11_0_beta_12.tar.gz) = e337183139c30b8c1c47ea8e979945300c4d9747357f768eef5ff725647f0a83a0a7a73e34dd55bf594f866fb1032b1349fc65aa660b4d28fe6e912b1fc2d7ff diff --git a/workrave.spec b/workrave.spec index b40ddd5..385f368 100644 --- a/workrave.spec +++ b/workrave.spec @@ -1,58 +1,53 @@ -%if 0%{?fedora} || 0%{?rhel} >= 9 %bcond gnome 1 %bcond gnome40 1 -%bcond gnome45 %[0%{?fedora} >= 39 || 0%{?rhel} >= 10] -%bcond gnome_flashback 1 -%bcond mate 1 -%bcond xfce 1 -%else -%bcond_without gnome -%bcond_with gnome40 -%bcond_with gnome45 -%bcond_with gnome_flashback -%bcond_without mate -%bcond_without xfce -%endif +%bcond gnome45 %[0%{?fedora} || 0%{?rhel} >= 10] +%bcond gnome_flashback %{undefined flatpak} +%bcond mate %{undefined flatpak} +%bcond xfce %{undefined flatpak} + +%global app_id org.workrave.Workrave Name: workrave -Version: 1.10.52 +Version: 1.11.0~beta.12 Release: %autorelease Summary: Program that assists in the recovery and prevention of RSI # Based on older packages by Dag Wieers and Steve Ratcliffe License: GPL-3.0-or-later AND LGPL-2.0-or-later URL: https://workrave.org/ -%global tag %(echo %{version} | sed -e 's/\\./_/g') +%global tag %(echo %{version} | sed -e 's/[\\.~]/_/g') Source0: https://github.com/rcaelers/workrave/archive/v%{tag}/%{name}-v%{tag}.tar.gz -Obsoletes: %{name}-gtk2 < 1.10.37-1 -Provides: %{name}-gtk2 = %{?epoch:%{epoch}:}%{version}-%{release} - -BuildRequires: make +BuildRequires: cmake +BuildRequires: desktop-file-utils +BuildRequires: gettext BuildRequires: gcc-c++ -BuildRequires: libX11-devel -BuildRequires: libXScrnSaver-devel -BuildRequires: pkgconfig(ice) -BuildRequires: pkgconfig(sm) -BuildRequires: pkgconfig(xtst) -BuildRequires: pkgconfig(glib-2.0) >= 2.28.0 -BuildRequires: pkgconfig(gio-2.0) >= 2.26.0 -BuildRequires: pkgconfig(gtk+-3.0) >= 3.0.0 -BuildRequires: pkgconfig(sigc++-2.0) >= 2.2.4.2 -BuildRequires: pkgconfig(glibmm-2.4) >= 2.28.0 -BuildRequires: pkgconfig(gtkmm-3.0) >= 3.0.0 -BuildRequires: gobject-introspection-devel >= 0.6.7 +BuildRequires: libappstream-glib +# Base dependencies BuildRequires: boost-devel -BuildRequires: python3 BuildRequires: python3-devel -BuildRequires: python3-cheetah BuildRequires: python3-jinja2 +# Gtk+3 interface +BuildRequires: pkgconfig(glib-2.0) >= 2.56.0 +BuildRequires: pkgconfig(gio-2.0) >= 2.56.0 +BuildRequires: pkgconfig(gtk+-3.0) >= 3.22.0 +BuildRequires: pkgconfig(glibmm-2.4) >= 2.28.0 +BuildRequires: pkgconfig(gtkmm-3.0) >= 3.22.0 +# Sound support BuildRequires: pkgconfig(gstreamer-1.0) BuildRequires: pkgconfig(libpulse) >= 0.9.15 BuildRequires: pkgconfig(libpulse-mainloop-glib) >= 0.9.15 -BuildRequires: gettext -BuildRequires: intltool -BuildRequires: autoconf, automake, libtool, autoconf-archive -BuildRequires: desktop-file-utils +# Wayland support +BuildRequires: pkgconfig(wayland-client) +BuildRequires: pkgconfig(wayland-scanner) +# X11 support +BuildRequires: libX11-devel +BuildRequires: libXScrnSaver-devel +BuildRequires: libXtst-devel +# Desktop applets +BuildRequires: pkgconfig(ayatana-appindicator3-0.1) +BuildRequires: pkgconfig(dbusmenu-glib-0.4) +BuildRequires: pkgconfig(dbusmenu-gtk3-0.4) +BuildRequires: pkgconfig(gobject-introspection-1.0) %if %{with gnome_flashback} BuildRequires: pkgconfig(libgnome-panel) %endif @@ -63,10 +58,14 @@ BuildRequires: pkgconfig(gtk4) BuildRequires: pkgconfig(libxfce4panel-2.0) >= 4.12 %endif %if %{with mate} -BuildRequires: pkgconfig(libmatepanelapplet-4.0) +BuildRequires: pkgconfig(libmatepanelapplet-4.0) >= 1.20.0 %endif +# Logging +BuildRequires: cmake(fmt) +BuildRequires: cmake(spdlog) Requires: dbus-common +Requires: hicolor-icon-theme Recommends: (%{name}-cinnamon if cinnamon) Recommends: (%{name}-gnome if gnome-shell) Recommends: (%{name}-gnome-flashback if gnome-panel) @@ -87,7 +86,7 @@ take micro-pauses, rest breaks and restricts you to your daily limit. %{_description} %package cinnamon -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} Summary: Workrave applet for Cinnamon desktop %description cinnamon @@ -96,7 +95,7 @@ Summary: Workrave applet for Cinnamon desktop This package provides an applet for the Cinnamon desktop. %package gnome -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} Summary: Workrave applet for GNOME desktop %description gnome @@ -105,7 +104,7 @@ Summary: Workrave applet for GNOME desktop This package provides an applet for the GNOME desktop. %package gnome-flashback -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} Summary: Workrave applet for GNOME Flashback %description gnome-flashback @@ -114,7 +113,7 @@ Summary: Workrave applet for GNOME Flashback This package provides an applet for the GNOME Flashback panel. %package mate -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} Summary: Workrave applet for MATE %description mate @@ -123,7 +122,7 @@ Summary: Workrave applet for MATE This package provides an applet for the MATE panel. %package xfce -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} Summary: Workrave applet for Xfce %description xfce @@ -134,77 +133,56 @@ This package provides an applet for the Xfce panel. %prep %autosetup -n workrave-%{tag} -p1 -touch ChangeLog -# https://bugzilla.redhat.com/show_bug.cgi?id=304121 -sed -i -e '/^DISTRIBUTION_HOME/s/\/$//' frontend/gtkmm/src/Makefile.* - # use versioned python command %py3_shebang_fix libs/dbus/bin/dbusgen.py -sed -i 's/AC_CHECK_PROG(PYTHON, python, python)/AC_CHECK_PROG(PYTHON, python3, python3)/' configure.ac + %build -if [ ! -x configure ]; then - ### Needed for snapshot releases. - NOCONFIGURE=1 ./autogen.sh -fi +%cmake \ + -DWITH_GNOME_CLASSIC_PANEL:BOOL=%{?with_gnome_flashback:ON}%{!?with_gnome_flashback:OFF} \ + -DWITH_GNOME45:BOOL=%{?with_gnome45:ON}%{!?with_gnome45:OFF} \ + -DWITH_MATE:BOOL=%{?with_mate:ON}%{!?with_mate:OFF} \ + -DWITH_XFCE4:BOOL=%{?with_xfce:ON}%{!?with_xfce:OFF} \ + -DWITH_DBUS:BOOL=ON \ + -DWITH_GSTREAMER:BOOL=ON \ + -DWITH_PULSE:BOOL=ON \ + -DWITH_DBUSMENU:BOOL=ON \ + -DWITH_INDICATOR:BOOL=ON \ + -DWITH_APPINDICATOR:BOOL=ON \ + -DWITH_WAYLAND:BOOL=ON \ + %{nil} -# gnome3 is flashback panel applet, not gnome-shell -%configure \ -%if %{with gnome_flashback} - --enable-gnome3 \ -%else - --disable-gnome3 \ -%endif -%if %{with gnome45} - --enable-gnome45 \ -%endif -%if %{with mate} - --enable-mate \ -%else - --disable-mate \ -%endif -%if %{with xfce} - --enable-xfce \ -%else - --disable-xfce \ -%endif - --disable-indicator \ - --disable-static --disable-xml +%cmake_build -%make_build %install -%make_install +%cmake_install -find %{buildroot} -name '*.la' -delete # workrave does not provide a public API rm -f %{buildroot}%{_datadir}/gir-1.0/*.gir rm -f %{buildroot}%{_libdir}/*.so +# indicators need to be enabled to build GIR but are not needed otherwise +rm -f %{buildroot}%{_libdir}/*indicators3/7/libworkrave.so* %find_lang %{name} -desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop + +%check +desktop-file-validate %{buildroot}%{_datadir}/applications/%{app_id}.desktop +appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{app_id}.metainfo.xml %files -f %{name}.lang %doc AUTHORS COPYING NEWS README.md -%{_bindir}/workrave -%{_datadir}/workrave/ -%{_datadir}/sounds/workrave/ -%{_datadir}/icons/hicolor/16x16/apps/workrave.png -%{_datadir}/icons/hicolor/24x24/apps/workrave.png -%{_datadir}/icons/hicolor/32x32/apps/workrave.png -%{_datadir}/icons/hicolor/48x48/apps/workrave.png -%{_datadir}/icons/hicolor/64x64/apps/workrave.png -%{_datadir}/icons/hicolor/96x96/apps/workrave.png -%{_datadir}/icons/hicolor/128x128/apps/workrave.png -%{_datadir}/icons/hicolor/scalable/workrave-sheep.svg -%{_datadir}/icons/hicolor/scalable/apps/workrave.svg -%{_datadir}/metainfo/workrave.appdata.xml -%{_datadir}/applications/workrave.desktop -%{_datadir}/dbus-1/services/org.workrave.Workrave.service +%{_bindir}/%{name} +%{_datadir}/applications/%{app_id}.desktop +%{_datadir}/dbus-1/services/%{app_id}.service %{_datadir}/glib-2.0/schemas/org.workrave.*.xml +%{_datadir}/icons/hicolor/*/apps/%{name}.* +%{_datadir}/sounds/%{name}/ +%{_datadir}/%{name}/ +%{_metainfodir}/%{app_id}.metainfo.xml # support library for gtk3 applets %{_libdir}/girepository-1.0/Workrave-1.0.typelib %{_libdir}/libworkrave-private-1.0.so.* From 8b0959342d47ff2d81d77c90a2f5511a21d0c5b5 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Fri, 31 May 2024 02:25:26 -0400 Subject: [PATCH 74/90] Fix operation on wayland Both GNOME Shell and KDE Plasma default to Wayland nowadays. --- ...739328fe57b14977ffa9bc16fe8d3daebffd.patch | 44 +++++ ...3e8d67491318bc600a74b5f893082458f5b3.patch | 46 +++++ ...028a179667676530d656e3abda602cc24fe3.patch | 22 +++ ...951f296c6ea1a0c2a64df3c243c436246902.patch | 41 ++++ ...3c3c6eb6372d6cb1c29fffac15de62e86fc4.patch | 68 +++++++ ...499f0360d03ba32ab66ac4c439877cc9574e.patch | 182 ++++++++++++++++++ workrave.spec | 12 +- 7 files changed, 414 insertions(+), 1 deletion(-) create mode 100644 4f91739328fe57b14977ffa9bc16fe8d3daebffd.patch create mode 100644 67303e8d67491318bc600a74b5f893082458f5b3.patch create mode 100644 88bd028a179667676530d656e3abda602cc24fe3.patch create mode 100644 a4c0951f296c6ea1a0c2a64df3c243c436246902.patch create mode 100644 d4503c3c6eb6372d6cb1c29fffac15de62e86fc4.patch create mode 100644 e9cf499f0360d03ba32ab66ac4c439877cc9574e.patch diff --git a/4f91739328fe57b14977ffa9bc16fe8d3daebffd.patch b/4f91739328fe57b14977ffa9bc16fe8d3daebffd.patch new file mode 100644 index 0000000..967b45b --- /dev/null +++ b/4f91739328fe57b14977ffa9bc16fe8d3daebffd.patch @@ -0,0 +1,44 @@ +From 4f91739328fe57b14977ffa9bc16fe8d3daebffd Mon Sep 17 00:00:00 2001 +From: Rob Caelers +Date: Sun, 5 May 2024 15:01:29 +0200 +Subject: [PATCH] Fix crash in dbus menu + +--- + ui/app/toolkits/gtkmm/platforms/unix/DbusMenu.cc | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/ui/app/toolkits/gtkmm/platforms/unix/DbusMenu.cc b/ui/app/toolkits/gtkmm/platforms/unix/DbusMenu.cc +index 8cc497c47..9ec8885ea 100644 +--- a/ui/app/toolkits/gtkmm/platforms/unix/DbusMenu.cc ++++ b/ui/app/toolkits/gtkmm/platforms/unix/DbusMenu.cc +@@ -136,6 +136,7 @@ DbusSubMenuEntry::init() + g_list_free(c); + children.clear(); + // g_object_unref(item); ++ item = nullptr; + } + item = new_item; + +@@ -152,13 +153,12 @@ DbusSubMenuEntry::add(DbusmenuMenuitem *child) + dbusmenu_menuitem_child_append(item, child); + }; + +-void DbusSubMenuEntry::add_section(){}; ++void DbusSubMenuEntry::add_section() {}; + + ////////////////////////////////////////////////////////////////////// + + DbusRadioGroupMenuEntry::DbusRadioGroupMenuEntry(DbusSubMenuEntry *parent, menus::RadioGroupNode::Ptr node) + { +- item = parent->get_item(); + for (auto child_node: node->get_children()) + { + auto child = std::make_shared(parent, child_node); +@@ -291,7 +291,6 @@ DbusSeparatorMenuEntry::DbusSeparatorMenuEntry(DbusSubMenuEntry *parent, menus:: + + DbusSectionMenuEntry::DbusSectionMenuEntry(DbusSubMenuEntry *parent, menus::SectionNode::Ptr node) + { +- item = parent->get_item(); + for (auto child_node: node->get_children()) + { + auto child = DbusMenuEntryFactory::create(parent, child_node); diff --git a/67303e8d67491318bc600a74b5f893082458f5b3.patch b/67303e8d67491318bc600a74b5f893082458f5b3.patch new file mode 100644 index 0000000..459df6a --- /dev/null +++ b/67303e8d67491318bc600a74b5f893082458f5b3.patch @@ -0,0 +1,46 @@ +From 67303e8d67491318bc600a74b5f893082458f5b3 Mon Sep 17 00:00:00 2001 +From: Rob Caelers +Date: Fri, 10 May 2024 15:43:28 +0200 +Subject: [PATCH] Log when preparing for sleep/wakeup + +--- + ui/app/toolkits/gtkmm/LoginSession.cc | 13 +++++++++++-- + 1 file changed, 11 insertions(+), 2 deletions(-) + +diff --git a/ui/app/toolkits/gtkmm/LoginSession.cc b/ui/app/toolkits/gtkmm/LoginSession.cc +index 9b0f0fca3..cd302776d 100644 +--- a/ui/app/toolkits/gtkmm/LoginSession.cc ++++ b/ui/app/toolkits/gtkmm/LoginSession.cc +@@ -59,7 +59,7 @@ LoginSession::init() + #if GLIBMM_CHECK_VERSION(2, 68, 0) + catch (std::exception &e) + { +- std::cerr << e.what() << std::endl; ++ spdlog::warn(std::string("Failed to subscribe to events from Login manager") + std::string(e.what())); + } + #else + catch (const Glib::Exception &e) +@@ -79,13 +79,22 @@ LoginSession::on_signal(const Glib::ustring &sender, const Glib::ustring &signal + Glib::Variant start; + params.get_child(start); + auto core = context->get_core(); ++ if (start.get()) ++ { ++ spdlog::info("Prepare for sleep"); ++ } ++ else ++ { ++ spdlog::info("Prepare for wakeup"); ++ } ++ + core->set_powersave(start.get()); + } + } + #if GLIBMM_CHECK_VERSION(2, 68, 0) + catch (std::exception &e) + { +- std::cerr << e.what() << std::endl; ++ spdlog::warn(std::string("Failed to process event from Login Manager:") + std::string(e.what())); + } + #else + catch (const Glib::Exception &e) diff --git a/88bd028a179667676530d656e3abda602cc24fe3.patch b/88bd028a179667676530d656e3abda602cc24fe3.patch new file mode 100644 index 0000000..6fe4183 --- /dev/null +++ b/88bd028a179667676530d656e3abda602cc24fe3.patch @@ -0,0 +1,22 @@ +From 88bd028a179667676530d656e3abda602cc24fe3 Mon Sep 17 00:00:00 2001 +From: Rob Caelers +Date: Sun, 5 May 2024 21:46:52 +0200 +Subject: [PATCH] Fix compilation error + +--- + ui/app/toolkits/gtkmm/LoginSession.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ui/app/toolkits/gtkmm/LoginSession.cc b/ui/app/toolkits/gtkmm/LoginSession.cc +index 426b7bbbb..9b0f0fca3 100644 +--- a/ui/app/toolkits/gtkmm/LoginSession.cc ++++ b/ui/app/toolkits/gtkmm/LoginSession.cc +@@ -79,7 +79,7 @@ LoginSession::on_signal(const Glib::ustring &sender, const Glib::ustring &signal + Glib::Variant start; + params.get_child(start); + auto core = context->get_core(); +- core->set_powersave(start); ++ core->set_powersave(start.get()); + } + } + #if GLIBMM_CHECK_VERSION(2, 68, 0) diff --git a/a4c0951f296c6ea1a0c2a64df3c243c436246902.patch b/a4c0951f296c6ea1a0c2a64df3c243c436246902.patch new file mode 100644 index 0000000..d9fae4e --- /dev/null +++ b/a4c0951f296c6ea1a0c2a64df3c243c436246902.patch @@ -0,0 +1,41 @@ +From a4c0951f296c6ea1a0c2a64df3c243c436246902 Mon Sep 17 00:00:00 2001 +From: Rob Caelers +Date: Sat, 4 May 2024 19:07:45 +0200 +Subject: [PATCH] Prevent crash when wayland is disabled + +--- + .../src/unix/UnixInputMonitorFactory.cc | 21 +++++++++++-------- + 1 file changed, 12 insertions(+), 9 deletions(-) + +diff --git a/libs/input-monitor/src/unix/UnixInputMonitorFactory.cc b/libs/input-monitor/src/unix/UnixInputMonitorFactory.cc +index 965ea1532..7994bb8de 100644 +--- a/libs/input-monitor/src/unix/UnixInputMonitorFactory.cc ++++ b/libs/input-monitor/src/unix/UnixInputMonitorFactory.cc +@@ -121,15 +121,18 @@ UnixInputMonitorFactory::create_monitor(MonitorCapability capability) + } + #endif + +- initialized = monitor->init(); +- +- if (initialized) +- { +- TRACE_MSG("Success"); +- break; +- } +- +- monitor.reset(); ++ if (monitor) ++ { ++ initialized = monitor->init(); ++ ++ if (initialized) ++ { ++ TRACE_MSG("Success"); ++ break; ++ } ++ ++ monitor.reset(); ++ } + + loop++; + if (loop == available_monitors.end()) diff --git a/d4503c3c6eb6372d6cb1c29fffac15de62e86fc4.patch b/d4503c3c6eb6372d6cb1c29fffac15de62e86fc4.patch new file mode 100644 index 0000000..22b036f --- /dev/null +++ b/d4503c3c6eb6372d6cb1c29fffac15de62e86fc4.patch @@ -0,0 +1,68 @@ +From d4503c3c6eb6372d6cb1c29fffac15de62e86fc4 Mon Sep 17 00:00:00 2001 +From: Rob Caelers +Date: Sat, 4 May 2024 19:07:20 +0200 +Subject: [PATCH] Add WITH_WAYLAND option + +--- + CMakeLists.txt | 33 ++++++++++++++++++++++++++------- + 1 file changed, 26 insertions(+), 7 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 084deda95..33430f2fa 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -415,14 +415,7 @@ if ("${WITH_UI}" STREQUAL "Qt") + endif() + endif() + +-if (UNIX AND NOT APPLE) +- pkg_check_modules(WAYLAND_CLIENT REQUIRED wayland-client) + +- find_program(WAYLAND_SCANNER wayland-scanner) +- if (NOT WAYLAND_SCANNER) +- message(FATAL_ERROR "wayland-scanner not found") +- endif() +-endif() + + #---------------------------------------------------------------------------------------------------- + # GStreamer +@@ -693,6 +686,31 @@ endif() + + find_package(Boost ${BOOST_MIN_VERSION} REQUIRED COMPONENTS ${BOOST_COMPONENTS}) + ++#---------------------------------------------------------------------------------------------------- ++# Wayland ++ ++option(WITH_WAYLAND "Enable Wayland support" ON) ++ ++if (UNIX AND NOT APPLE) ++ if (WITH_WAYLAND) ++ message(STATUS "Checking for: Wayland") ++ ++ pkg_check_modules(WAYLAND_CLIENT wayland-client) ++ ++ find_program(WAYLAND_SCANNER wayland-scanner) ++ if (NOT WAYLAND_SCANNER) ++ message(ERROR "wayland-scanner not found") ++ endif() ++ ++ if (WAYLAND_CLIENT_FOUND AND WAYLAND_SCANNER) ++ set (HAVE_WAYLAND ON) ++ else() ++ set (WITH_WAYLAND OFF) ++ endif() ++ endif() ++endif() ++ ++ + #---------------------------------------------------------------------------------------------------- + # Translations + +@@ -1145,6 +1163,7 @@ feature_bool("Legacy StatusIcon" HAVE_STATUSICON ) + feature_bool("DBus Menus" HAVE_DBUSMENU) + feature_bool("GStreamer" HAVE_GSTREAMER) + feature_bool("Pulseaudio" HAVE_PULSE) ++feature_bool("Wayland" HAVE_WAYLAND) + endif() + feature_bool("DBUS" HAVE_DBUS) + if(PLATFORM_OS_WINDOWS) diff --git a/e9cf499f0360d03ba32ab66ac4c439877cc9574e.patch b/e9cf499f0360d03ba32ab66ac4c439877cc9574e.patch new file mode 100644 index 0000000..46b133f --- /dev/null +++ b/e9cf499f0360d03ba32ab66ac4c439877cc9574e.patch @@ -0,0 +1,182 @@ +From e9cf499f0360d03ba32ab66ac4c439877cc9574e Mon Sep 17 00:00:00 2001 +From: Rob Caelers +Date: Sun, 5 May 2024 21:17:25 +0200 +Subject: [PATCH] Detect sleep/suspend on Linux + +--- + ui/app/toolkits/gtkmm/CMakeLists.txt | 1 + + ui/app/toolkits/gtkmm/LoginSession.cc | 96 +++++++++++++++++++++++++++ + ui/app/toolkits/gtkmm/LoginSession.hh | 49 ++++++++++++++ + 3 files changed, 146 insertions(+) + create mode 100644 ui/app/toolkits/gtkmm/LoginSession.cc + create mode 100644 ui/app/toolkits/gtkmm/LoginSession.hh + +diff --git a/ui/app/toolkits/gtkmm/CMakeLists.txt b/ui/app/toolkits/gtkmm/CMakeLists.txt +index 9f1e21103..549bb85e2 100644 +--- a/ui/app/toolkits/gtkmm/CMakeLists.txt ++++ b/ui/app/toolkits/gtkmm/CMakeLists.txt +@@ -8,6 +8,7 @@ target_sources(workrave-toolkit-gtkmm PRIVATE + ExercisesDialog.cc + ExercisesPanel.cc + GnomeSession.cc ++ LoginSession.cc + GtkUtil.cc + HeadInfo.cc + Hig.cc +diff --git a/ui/app/toolkits/gtkmm/LoginSession.cc b/ui/app/toolkits/gtkmm/LoginSession.cc +new file mode 100644 +index 000000000..426b7bbbb +--- /dev/null ++++ b/ui/app/toolkits/gtkmm/LoginSession.cc +@@ -0,0 +1,96 @@ ++// Copyright (C) 2024 Rob Caelers ++// All rights reserved. ++// ++// This program is free software: you can redistribute it and/or modify ++// it under the terms of the GNU General Public License as published by ++// the Free Software Foundation, either version 3 of the License, or ++// (at your option) any later version. ++// ++// This program is distributed in the hope that it will be useful, ++// but WITHOUT ANY WARRANTY; without even the implied warranty of ++// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++// GNU General Public License for more details. ++// ++// You should have received a copy of the GNU General Public License ++// along with this program. If not, see . ++// ++ ++#ifdef HAVE_CONFIG_H ++# include "config.h" ++#endif ++ ++#include ++#include ++ ++#include "LoginSession.hh" ++#include "GtkUtil.hh" ++ ++#include "debug.hh" ++ ++LoginSession::LoginSession(std::shared_ptr context) ++ : context(context) ++{ ++ TRACE_ENTRY(); ++ init(); ++} ++ ++LoginSession::~LoginSession() ++{ ++ TRACE_ENTRY(); ++} ++ ++void ++LoginSession::init() ++{ ++ try ++ { ++ proxy = Gio::DBus::Proxy::create_for_bus_sync( ++#if GLIBMM_CHECK_VERSION(2, 68, 0) ++ Gio::DBus::BusType::SYSTEM, ++#else ++ Gio::DBus::BUS_TYPE_SYSTEM, ++#endif ++ "org.freedesktop.login1", ++ "/org/freedesktop/login1", ++ "org.freedesktop.login1.Manager"); ++ ++ proxy->signal_signal().connect(sigc::mem_fun(*this, &LoginSession::on_signal)); ++ } ++#if GLIBMM_CHECK_VERSION(2, 68, 0) ++ catch (std::exception &e) ++ { ++ std::cerr << e.what() << std::endl; ++ } ++#else ++ catch (const Glib::Exception &e) ++ { ++ spdlog::warn(std::string("Failed to subscribe to events from Login manager") + std::string(e.what())); ++ } ++#endif ++} ++ ++void ++LoginSession::on_signal(const Glib::ustring &sender, const Glib::ustring &signal_name, const Glib::VariantContainerBase ¶ms) ++{ ++ try ++ { ++ if (signal_name == "PrepareForSleep") ++ { ++ Glib::Variant start; ++ params.get_child(start); ++ auto core = context->get_core(); ++ core->set_powersave(start); ++ } ++ } ++#if GLIBMM_CHECK_VERSION(2, 68, 0) ++ catch (std::exception &e) ++ { ++ std::cerr << e.what() << std::endl; ++ } ++#else ++ catch (const Glib::Exception &e) ++ { ++ spdlog::warn(std::string("Failed to process event from Login Manager:") + std::string(e.what())); ++ } ++#endif ++} +diff --git a/ui/app/toolkits/gtkmm/LoginSession.hh b/ui/app/toolkits/gtkmm/LoginSession.hh +new file mode 100644 +index 000000000..8550aca74 +--- /dev/null ++++ b/ui/app/toolkits/gtkmm/LoginSession.hh +@@ -0,0 +1,49 @@ ++// Copyright (C) 2024 Rob Caelers ++// All rights reserved. ++// ++// This program is free software: you can redistribute it and/or modify ++// it under the terms of the GNU General Public License as published by ++// the Free Software Foundation, either version 3 of the License, or ++// (at your option) any later version. ++// ++// This program is distributed in the hope that it will be useful, ++// but WITHOUT ANY WARRANTY; without even the implied warranty of ++// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++// GNU General Public License for more details. ++// ++// You should have received a copy of the GNU General Public License ++// along with this program. If not, see . ++// ++ ++#ifndef WORKRAVE_UI_LOGIN_SESSION_HH ++#define WORKRAVE_UI_LOGIN_SESSION_HH ++ ++#include ++ ++#include ++ ++#include "ui/Plugin.hh" ++ ++class LoginSession : public Plugin ++{ ++public: ++ using Ptr = std::shared_ptr; ++ ++ explicit LoginSession(std::shared_ptr context); ++ ~LoginSession() override; ++ void init(); ++ ++ std::string get_plugin_id() const override ++ { ++ return "workrave.LoginSession"; ++ } ++ ++private: ++ void on_signal(const Glib::ustring &sender, const Glib::ustring &signal_name, const Glib::VariantContainerBase ¶ms); ++ ++private: ++ std::shared_ptr context; ++ Glib::RefPtr proxy; ++}; ++ ++#endif // WORKRAVE_UI_LOGIN_SESSION_HH diff --git a/workrave.spec b/workrave.spec index 385f368..1792209 100644 --- a/workrave.spec +++ b/workrave.spec @@ -15,7 +15,14 @@ Summary: Program that assists in the recovery and prevention of RSI License: GPL-3.0-or-later AND LGPL-2.0-or-later URL: https://workrave.org/ %global tag %(echo %{version} | sed -e 's/[\\.~]/_/g') -Source0: https://github.com/rcaelers/workrave/archive/v%{tag}/%{name}-v%{tag}.tar.gz +Source: https://github.com/rcaelers/workrave/archive/v%{tag}/%{name}-v%{tag}.tar.gz +# upstream post-release patches +Patch: https://github.com/rcaelers/workrave/commit/d4503c3c6eb6372d6cb1c29fffac15de62e86fc4.patch +Patch: https://github.com/rcaelers/workrave/commit/a4c0951f296c6ea1a0c2a64df3c243c436246902.patch +Patch: https://github.com/rcaelers/workrave/commit/4f91739328fe57b14977ffa9bc16fe8d3daebffd.patch +Patch: https://github.com/rcaelers/workrave/commit/e9cf499f0360d03ba32ab66ac4c439877cc9574e.patch +Patch: https://github.com/rcaelers/workrave/commit/88bd028a179667676530d656e3abda602cc24fe3.patch +Patch: https://github.com/rcaelers/workrave/commit/67303e8d67491318bc600a74b5f893082458f5b3.patch BuildRequires: cmake BuildRequires: desktop-file-utils @@ -165,6 +172,9 @@ rm -f %{buildroot}%{_libdir}/*.so # indicators need to be enabled to build GIR but are not needed otherwise rm -f %{buildroot}%{_libdir}/*indicators3/7/libworkrave.so* +# fix appstream ID +appstream-util modify %{buildroot}%{_metainfodir}/%{app_id}.metainfo.xml id %{app_id} + %find_lang %{name} From 1383ef8606a649a70b62ac35aff55b7b329cf096 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Fri, 14 Jun 2024 13:36:59 -0400 Subject: [PATCH 75/90] 1.11.0~beta.13 --- .gitignore | 1 + ...739328fe57b14977ffa9bc16fe8d3daebffd.patch | 44 ----- ...3e8d67491318bc600a74b5f893082458f5b3.patch | 46 ----- ...028a179667676530d656e3abda602cc24fe3.patch | 22 --- ...951f296c6ea1a0c2a64df3c243c436246902.patch | 41 ---- ...3c3c6eb6372d6cb1c29fffac15de62e86fc4.patch | 68 ------- ...499f0360d03ba32ab66ac4c439877cc9574e.patch | 182 ------------------ sources | 2 +- workrave.spec | 9 +- 9 files changed, 3 insertions(+), 412 deletions(-) delete mode 100644 4f91739328fe57b14977ffa9bc16fe8d3daebffd.patch delete mode 100644 67303e8d67491318bc600a74b5f893082458f5b3.patch delete mode 100644 88bd028a179667676530d656e3abda602cc24fe3.patch delete mode 100644 a4c0951f296c6ea1a0c2a64df3c243c436246902.patch delete mode 100644 d4503c3c6eb6372d6cb1c29fffac15de62e86fc4.patch delete mode 100644 e9cf499f0360d03ba32ab66ac4c439877cc9574e.patch diff --git a/.gitignore b/.gitignore index 86f023d..79fee17 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ workrave-1.9.1.tar.gz /workrave-v1_10_51_1.tar.gz /workrave-v1_10_52.tar.gz /workrave-v1_11_0_beta_12.tar.gz +/workrave-v1_11_0_beta_13.tar.gz diff --git a/4f91739328fe57b14977ffa9bc16fe8d3daebffd.patch b/4f91739328fe57b14977ffa9bc16fe8d3daebffd.patch deleted file mode 100644 index 967b45b..0000000 --- a/4f91739328fe57b14977ffa9bc16fe8d3daebffd.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 4f91739328fe57b14977ffa9bc16fe8d3daebffd Mon Sep 17 00:00:00 2001 -From: Rob Caelers -Date: Sun, 5 May 2024 15:01:29 +0200 -Subject: [PATCH] Fix crash in dbus menu - ---- - ui/app/toolkits/gtkmm/platforms/unix/DbusMenu.cc | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/ui/app/toolkits/gtkmm/platforms/unix/DbusMenu.cc b/ui/app/toolkits/gtkmm/platforms/unix/DbusMenu.cc -index 8cc497c47..9ec8885ea 100644 ---- a/ui/app/toolkits/gtkmm/platforms/unix/DbusMenu.cc -+++ b/ui/app/toolkits/gtkmm/platforms/unix/DbusMenu.cc -@@ -136,6 +136,7 @@ DbusSubMenuEntry::init() - g_list_free(c); - children.clear(); - // g_object_unref(item); -+ item = nullptr; - } - item = new_item; - -@@ -152,13 +153,12 @@ DbusSubMenuEntry::add(DbusmenuMenuitem *child) - dbusmenu_menuitem_child_append(item, child); - }; - --void DbusSubMenuEntry::add_section(){}; -+void DbusSubMenuEntry::add_section() {}; - - ////////////////////////////////////////////////////////////////////// - - DbusRadioGroupMenuEntry::DbusRadioGroupMenuEntry(DbusSubMenuEntry *parent, menus::RadioGroupNode::Ptr node) - { -- item = parent->get_item(); - for (auto child_node: node->get_children()) - { - auto child = std::make_shared(parent, child_node); -@@ -291,7 +291,6 @@ DbusSeparatorMenuEntry::DbusSeparatorMenuEntry(DbusSubMenuEntry *parent, menus:: - - DbusSectionMenuEntry::DbusSectionMenuEntry(DbusSubMenuEntry *parent, menus::SectionNode::Ptr node) - { -- item = parent->get_item(); - for (auto child_node: node->get_children()) - { - auto child = DbusMenuEntryFactory::create(parent, child_node); diff --git a/67303e8d67491318bc600a74b5f893082458f5b3.patch b/67303e8d67491318bc600a74b5f893082458f5b3.patch deleted file mode 100644 index 459df6a..0000000 --- a/67303e8d67491318bc600a74b5f893082458f5b3.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 67303e8d67491318bc600a74b5f893082458f5b3 Mon Sep 17 00:00:00 2001 -From: Rob Caelers -Date: Fri, 10 May 2024 15:43:28 +0200 -Subject: [PATCH] Log when preparing for sleep/wakeup - ---- - ui/app/toolkits/gtkmm/LoginSession.cc | 13 +++++++++++-- - 1 file changed, 11 insertions(+), 2 deletions(-) - -diff --git a/ui/app/toolkits/gtkmm/LoginSession.cc b/ui/app/toolkits/gtkmm/LoginSession.cc -index 9b0f0fca3..cd302776d 100644 ---- a/ui/app/toolkits/gtkmm/LoginSession.cc -+++ b/ui/app/toolkits/gtkmm/LoginSession.cc -@@ -59,7 +59,7 @@ LoginSession::init() - #if GLIBMM_CHECK_VERSION(2, 68, 0) - catch (std::exception &e) - { -- std::cerr << e.what() << std::endl; -+ spdlog::warn(std::string("Failed to subscribe to events from Login manager") + std::string(e.what())); - } - #else - catch (const Glib::Exception &e) -@@ -79,13 +79,22 @@ LoginSession::on_signal(const Glib::ustring &sender, const Glib::ustring &signal - Glib::Variant start; - params.get_child(start); - auto core = context->get_core(); -+ if (start.get()) -+ { -+ spdlog::info("Prepare for sleep"); -+ } -+ else -+ { -+ spdlog::info("Prepare for wakeup"); -+ } -+ - core->set_powersave(start.get()); - } - } - #if GLIBMM_CHECK_VERSION(2, 68, 0) - catch (std::exception &e) - { -- std::cerr << e.what() << std::endl; -+ spdlog::warn(std::string("Failed to process event from Login Manager:") + std::string(e.what())); - } - #else - catch (const Glib::Exception &e) diff --git a/88bd028a179667676530d656e3abda602cc24fe3.patch b/88bd028a179667676530d656e3abda602cc24fe3.patch deleted file mode 100644 index 6fe4183..0000000 --- a/88bd028a179667676530d656e3abda602cc24fe3.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 88bd028a179667676530d656e3abda602cc24fe3 Mon Sep 17 00:00:00 2001 -From: Rob Caelers -Date: Sun, 5 May 2024 21:46:52 +0200 -Subject: [PATCH] Fix compilation error - ---- - ui/app/toolkits/gtkmm/LoginSession.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/ui/app/toolkits/gtkmm/LoginSession.cc b/ui/app/toolkits/gtkmm/LoginSession.cc -index 426b7bbbb..9b0f0fca3 100644 ---- a/ui/app/toolkits/gtkmm/LoginSession.cc -+++ b/ui/app/toolkits/gtkmm/LoginSession.cc -@@ -79,7 +79,7 @@ LoginSession::on_signal(const Glib::ustring &sender, const Glib::ustring &signal - Glib::Variant start; - params.get_child(start); - auto core = context->get_core(); -- core->set_powersave(start); -+ core->set_powersave(start.get()); - } - } - #if GLIBMM_CHECK_VERSION(2, 68, 0) diff --git a/a4c0951f296c6ea1a0c2a64df3c243c436246902.patch b/a4c0951f296c6ea1a0c2a64df3c243c436246902.patch deleted file mode 100644 index d9fae4e..0000000 --- a/a4c0951f296c6ea1a0c2a64df3c243c436246902.patch +++ /dev/null @@ -1,41 +0,0 @@ -From a4c0951f296c6ea1a0c2a64df3c243c436246902 Mon Sep 17 00:00:00 2001 -From: Rob Caelers -Date: Sat, 4 May 2024 19:07:45 +0200 -Subject: [PATCH] Prevent crash when wayland is disabled - ---- - .../src/unix/UnixInputMonitorFactory.cc | 21 +++++++++++-------- - 1 file changed, 12 insertions(+), 9 deletions(-) - -diff --git a/libs/input-monitor/src/unix/UnixInputMonitorFactory.cc b/libs/input-monitor/src/unix/UnixInputMonitorFactory.cc -index 965ea1532..7994bb8de 100644 ---- a/libs/input-monitor/src/unix/UnixInputMonitorFactory.cc -+++ b/libs/input-monitor/src/unix/UnixInputMonitorFactory.cc -@@ -121,15 +121,18 @@ UnixInputMonitorFactory::create_monitor(MonitorCapability capability) - } - #endif - -- initialized = monitor->init(); -- -- if (initialized) -- { -- TRACE_MSG("Success"); -- break; -- } -- -- monitor.reset(); -+ if (monitor) -+ { -+ initialized = monitor->init(); -+ -+ if (initialized) -+ { -+ TRACE_MSG("Success"); -+ break; -+ } -+ -+ monitor.reset(); -+ } - - loop++; - if (loop == available_monitors.end()) diff --git a/d4503c3c6eb6372d6cb1c29fffac15de62e86fc4.patch b/d4503c3c6eb6372d6cb1c29fffac15de62e86fc4.patch deleted file mode 100644 index 22b036f..0000000 --- a/d4503c3c6eb6372d6cb1c29fffac15de62e86fc4.patch +++ /dev/null @@ -1,68 +0,0 @@ -From d4503c3c6eb6372d6cb1c29fffac15de62e86fc4 Mon Sep 17 00:00:00 2001 -From: Rob Caelers -Date: Sat, 4 May 2024 19:07:20 +0200 -Subject: [PATCH] Add WITH_WAYLAND option - ---- - CMakeLists.txt | 33 ++++++++++++++++++++++++++------- - 1 file changed, 26 insertions(+), 7 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 084deda95..33430f2fa 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -415,14 +415,7 @@ if ("${WITH_UI}" STREQUAL "Qt") - endif() - endif() - --if (UNIX AND NOT APPLE) -- pkg_check_modules(WAYLAND_CLIENT REQUIRED wayland-client) - -- find_program(WAYLAND_SCANNER wayland-scanner) -- if (NOT WAYLAND_SCANNER) -- message(FATAL_ERROR "wayland-scanner not found") -- endif() --endif() - - #---------------------------------------------------------------------------------------------------- - # GStreamer -@@ -693,6 +686,31 @@ endif() - - find_package(Boost ${BOOST_MIN_VERSION} REQUIRED COMPONENTS ${BOOST_COMPONENTS}) - -+#---------------------------------------------------------------------------------------------------- -+# Wayland -+ -+option(WITH_WAYLAND "Enable Wayland support" ON) -+ -+if (UNIX AND NOT APPLE) -+ if (WITH_WAYLAND) -+ message(STATUS "Checking for: Wayland") -+ -+ pkg_check_modules(WAYLAND_CLIENT wayland-client) -+ -+ find_program(WAYLAND_SCANNER wayland-scanner) -+ if (NOT WAYLAND_SCANNER) -+ message(ERROR "wayland-scanner not found") -+ endif() -+ -+ if (WAYLAND_CLIENT_FOUND AND WAYLAND_SCANNER) -+ set (HAVE_WAYLAND ON) -+ else() -+ set (WITH_WAYLAND OFF) -+ endif() -+ endif() -+endif() -+ -+ - #---------------------------------------------------------------------------------------------------- - # Translations - -@@ -1145,6 +1163,7 @@ feature_bool("Legacy StatusIcon" HAVE_STATUSICON ) - feature_bool("DBus Menus" HAVE_DBUSMENU) - feature_bool("GStreamer" HAVE_GSTREAMER) - feature_bool("Pulseaudio" HAVE_PULSE) -+feature_bool("Wayland" HAVE_WAYLAND) - endif() - feature_bool("DBUS" HAVE_DBUS) - if(PLATFORM_OS_WINDOWS) diff --git a/e9cf499f0360d03ba32ab66ac4c439877cc9574e.patch b/e9cf499f0360d03ba32ab66ac4c439877cc9574e.patch deleted file mode 100644 index 46b133f..0000000 --- a/e9cf499f0360d03ba32ab66ac4c439877cc9574e.patch +++ /dev/null @@ -1,182 +0,0 @@ -From e9cf499f0360d03ba32ab66ac4c439877cc9574e Mon Sep 17 00:00:00 2001 -From: Rob Caelers -Date: Sun, 5 May 2024 21:17:25 +0200 -Subject: [PATCH] Detect sleep/suspend on Linux - ---- - ui/app/toolkits/gtkmm/CMakeLists.txt | 1 + - ui/app/toolkits/gtkmm/LoginSession.cc | 96 +++++++++++++++++++++++++++ - ui/app/toolkits/gtkmm/LoginSession.hh | 49 ++++++++++++++ - 3 files changed, 146 insertions(+) - create mode 100644 ui/app/toolkits/gtkmm/LoginSession.cc - create mode 100644 ui/app/toolkits/gtkmm/LoginSession.hh - -diff --git a/ui/app/toolkits/gtkmm/CMakeLists.txt b/ui/app/toolkits/gtkmm/CMakeLists.txt -index 9f1e21103..549bb85e2 100644 ---- a/ui/app/toolkits/gtkmm/CMakeLists.txt -+++ b/ui/app/toolkits/gtkmm/CMakeLists.txt -@@ -8,6 +8,7 @@ target_sources(workrave-toolkit-gtkmm PRIVATE - ExercisesDialog.cc - ExercisesPanel.cc - GnomeSession.cc -+ LoginSession.cc - GtkUtil.cc - HeadInfo.cc - Hig.cc -diff --git a/ui/app/toolkits/gtkmm/LoginSession.cc b/ui/app/toolkits/gtkmm/LoginSession.cc -new file mode 100644 -index 000000000..426b7bbbb ---- /dev/null -+++ b/ui/app/toolkits/gtkmm/LoginSession.cc -@@ -0,0 +1,96 @@ -+// Copyright (C) 2024 Rob Caelers -+// All rights reserved. -+// -+// This program is free software: you can redistribute it and/or modify -+// it under the terms of the GNU General Public License as published by -+// the Free Software Foundation, either version 3 of the License, or -+// (at your option) any later version. -+// -+// This program is distributed in the hope that it will be useful, -+// but WITHOUT ANY WARRANTY; without even the implied warranty of -+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+// GNU General Public License for more details. -+// -+// You should have received a copy of the GNU General Public License -+// along with this program. If not, see . -+// -+ -+#ifdef HAVE_CONFIG_H -+# include "config.h" -+#endif -+ -+#include -+#include -+ -+#include "LoginSession.hh" -+#include "GtkUtil.hh" -+ -+#include "debug.hh" -+ -+LoginSession::LoginSession(std::shared_ptr context) -+ : context(context) -+{ -+ TRACE_ENTRY(); -+ init(); -+} -+ -+LoginSession::~LoginSession() -+{ -+ TRACE_ENTRY(); -+} -+ -+void -+LoginSession::init() -+{ -+ try -+ { -+ proxy = Gio::DBus::Proxy::create_for_bus_sync( -+#if GLIBMM_CHECK_VERSION(2, 68, 0) -+ Gio::DBus::BusType::SYSTEM, -+#else -+ Gio::DBus::BUS_TYPE_SYSTEM, -+#endif -+ "org.freedesktop.login1", -+ "/org/freedesktop/login1", -+ "org.freedesktop.login1.Manager"); -+ -+ proxy->signal_signal().connect(sigc::mem_fun(*this, &LoginSession::on_signal)); -+ } -+#if GLIBMM_CHECK_VERSION(2, 68, 0) -+ catch (std::exception &e) -+ { -+ std::cerr << e.what() << std::endl; -+ } -+#else -+ catch (const Glib::Exception &e) -+ { -+ spdlog::warn(std::string("Failed to subscribe to events from Login manager") + std::string(e.what())); -+ } -+#endif -+} -+ -+void -+LoginSession::on_signal(const Glib::ustring &sender, const Glib::ustring &signal_name, const Glib::VariantContainerBase ¶ms) -+{ -+ try -+ { -+ if (signal_name == "PrepareForSleep") -+ { -+ Glib::Variant start; -+ params.get_child(start); -+ auto core = context->get_core(); -+ core->set_powersave(start); -+ } -+ } -+#if GLIBMM_CHECK_VERSION(2, 68, 0) -+ catch (std::exception &e) -+ { -+ std::cerr << e.what() << std::endl; -+ } -+#else -+ catch (const Glib::Exception &e) -+ { -+ spdlog::warn(std::string("Failed to process event from Login Manager:") + std::string(e.what())); -+ } -+#endif -+} -diff --git a/ui/app/toolkits/gtkmm/LoginSession.hh b/ui/app/toolkits/gtkmm/LoginSession.hh -new file mode 100644 -index 000000000..8550aca74 ---- /dev/null -+++ b/ui/app/toolkits/gtkmm/LoginSession.hh -@@ -0,0 +1,49 @@ -+// Copyright (C) 2024 Rob Caelers -+// All rights reserved. -+// -+// This program is free software: you can redistribute it and/or modify -+// it under the terms of the GNU General Public License as published by -+// the Free Software Foundation, either version 3 of the License, or -+// (at your option) any later version. -+// -+// This program is distributed in the hope that it will be useful, -+// but WITHOUT ANY WARRANTY; without even the implied warranty of -+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+// GNU General Public License for more details. -+// -+// You should have received a copy of the GNU General Public License -+// along with this program. If not, see . -+// -+ -+#ifndef WORKRAVE_UI_LOGIN_SESSION_HH -+#define WORKRAVE_UI_LOGIN_SESSION_HH -+ -+#include -+ -+#include -+ -+#include "ui/Plugin.hh" -+ -+class LoginSession : public Plugin -+{ -+public: -+ using Ptr = std::shared_ptr; -+ -+ explicit LoginSession(std::shared_ptr context); -+ ~LoginSession() override; -+ void init(); -+ -+ std::string get_plugin_id() const override -+ { -+ return "workrave.LoginSession"; -+ } -+ -+private: -+ void on_signal(const Glib::ustring &sender, const Glib::ustring &signal_name, const Glib::VariantContainerBase ¶ms); -+ -+private: -+ std::shared_ptr context; -+ Glib::RefPtr proxy; -+}; -+ -+#endif // WORKRAVE_UI_LOGIN_SESSION_HH diff --git a/sources b/sources index b945f73..6928137 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (workrave-v1_11_0_beta_12.tar.gz) = e337183139c30b8c1c47ea8e979945300c4d9747357f768eef5ff725647f0a83a0a7a73e34dd55bf594f866fb1032b1349fc65aa660b4d28fe6e912b1fc2d7ff +SHA512 (workrave-v1_11_0_beta_13.tar.gz) = b0f24572d41d072d5fcc383ef2c01408a3f5329f2c48432041b19705eeb637f7eee030b4b659741a1dbcbc676430740cde64f7f0647aa9de77e8732c3157c3e1 diff --git a/workrave.spec b/workrave.spec index 1792209..105702f 100644 --- a/workrave.spec +++ b/workrave.spec @@ -8,7 +8,7 @@ %global app_id org.workrave.Workrave Name: workrave -Version: 1.11.0~beta.12 +Version: 1.11.0~beta.13 Release: %autorelease Summary: Program that assists in the recovery and prevention of RSI # Based on older packages by Dag Wieers and Steve Ratcliffe @@ -16,13 +16,6 @@ License: GPL-3.0-or-later AND LGPL-2.0-or-later URL: https://workrave.org/ %global tag %(echo %{version} | sed -e 's/[\\.~]/_/g') Source: https://github.com/rcaelers/workrave/archive/v%{tag}/%{name}-v%{tag}.tar.gz -# upstream post-release patches -Patch: https://github.com/rcaelers/workrave/commit/d4503c3c6eb6372d6cb1c29fffac15de62e86fc4.patch -Patch: https://github.com/rcaelers/workrave/commit/a4c0951f296c6ea1a0c2a64df3c243c436246902.patch -Patch: https://github.com/rcaelers/workrave/commit/4f91739328fe57b14977ffa9bc16fe8d3daebffd.patch -Patch: https://github.com/rcaelers/workrave/commit/e9cf499f0360d03ba32ab66ac4c439877cc9574e.patch -Patch: https://github.com/rcaelers/workrave/commit/88bd028a179667676530d656e3abda602cc24fe3.patch -Patch: https://github.com/rcaelers/workrave/commit/67303e8d67491318bc600a74b5f893082458f5b3.patch BuildRequires: cmake BuildRequires: desktop-file-utils From a1dd7e73adb0f9045f32937799db8952e14baff0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 09:32:10 +0000 Subject: [PATCH 76/90] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 630c7e05debe7e25e0ef3e00b060ca7da021db25 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Tue, 19 Nov 2024 11:37:56 -0600 Subject: [PATCH 77/90] Orphaned for 6+ weeks --- .gitignore | 20 ----- changelog | 227 ------------------------------------------------- dead.package | 1 + sources | 1 - workrave.spec | 229 -------------------------------------------------- 5 files changed, 1 insertion(+), 477 deletions(-) delete mode 100644 .gitignore delete mode 100644 changelog create mode 100644 dead.package delete mode 100644 sources delete mode 100644 workrave.spec diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 79fee17..0000000 --- a/.gitignore +++ /dev/null @@ -1,20 +0,0 @@ -/results_workrave -/workrave*rpm -workrave-1.9.1.tar.gz -/workrave-1.9.2.tar.gz -/workrave-1.9.3.tar.gz -/workrave-1.9.911-6f9bc5d.tar.gz -/workrave-1.10.tar.gz -/workrave-v1_10_10.tar.gz -/workrave-v1_10_15.tar.gz -/workrave-v1_10_16.tar.gz -/workrave-v1_10_20.tar.gz -/workrave-v1_10_37.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 -/workrave-v1_10_51_1.tar.gz -/workrave-v1_10_52.tar.gz -/workrave-v1_11_0_beta_12.tar.gz -/workrave-v1_11_0_beta_13.tar.gz diff --git a/changelog b/changelog deleted file mode 100644 index f929c6f..0000000 --- a/changelog +++ /dev/null @@ -1,227 +0,0 @@ -* Sat Jul 22 2023 Fedora Release Engineering - 1.10.50-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Sat Jan 21 2023 Fedora Release Engineering - 1.10.50-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* 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 - -* Sat Jan 22 2022 Fedora Release Engineering - 1.10.49-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Sun Jan 09 2022 Mukundan Ragavan - 1.10.49-1 -- Update to 1.10.49 -- Fixes rhbz#1986369 and rhbz#2035023 - -* Fri Jul 23 2021 Fedora Release Engineering - 1.10.45-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Thu May 06 2021 Mukundan Ragavan - 1.10.45-1 -- Update to 1.10.45 -- Drop upstreamed patch - -* Mon Feb 08 2021 Mukundan Ragavan - 1.10.44-3 -- Build against xfce-4.16 - -* Wed Jan 27 2021 Fedora Release Engineering - 1.10.44-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Fri Oct 02 2020 Lukas Zapletal - 1.10.44-1 -- new version - -* Wed Jul 29 2020 Fedora Release Engineering - 1.10.37-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Fri Mar 27 2020 Lukas Zapletal - 1.10.37-1 -- new version - -* Fri Jan 31 2020 Fedora Release Engineering - 1.10.20-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Sat Jul 27 2019 Fedora Release Engineering - 1.10.20-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri Apr 12 2019 Lukas Zapletal - 1.10.20-5 -- Updated X11 and python3 deps - -* Sun Feb 03 2019 Fedora Release Engineering - 1.10.20-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Sat Jul 14 2018 Fedora Release Engineering - 1.10.20-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Fri Feb 09 2018 Fedora Release Engineering - 1.10.20-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Tue Nov 14 2017 Yaakov Selkowitz - 1.10.20-1 -- new version (#1508256) - -* Thu Aug 03 2017 Fedora Release Engineering - 1.10.16-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 1.10.16-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Feb 11 2017 Fedora Release Engineering - 1.10.16-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Fri Sep 16 2016 Yaakov Selkowitz - 1.10.16-1 -- new version (#1376625) - -* Thu May 12 2016 Yaakov Selkowitz - 1.10.15-1 -- new version (#1321458) - -* Fri Feb 26 2016 Yaakov Selkowitz - 1.10.10-1 -- new version -- Add Cinnamon, Indicator, MATE, Xfce applets -- Cleanup spec - -* Fri Feb 05 2016 Fedora Release Engineering - 1.10-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Fri Jun 19 2015 Fedora Release Engineering - 1.10-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sat May 02 2015 Kalev Lember - 1.10-8 -- Rebuilt for GCC 5 C++11 ABI change - -* Mon Aug 18 2014 Fedora Release Engineering - 1.10-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Tue Jul 22 2014 Kalev Lember - 1.10-6 -- Rebuilt for gobject-introspection 1.41.4 - -* Sun Jun 08 2014 Fedora Release Engineering - 1.10-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Sun Aug 04 2013 Fedora Release Engineering - 1.10-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Fri May 3 2013 Tomáš Mráz - 1.10-3 -- do not build the panel applet - -* Mon Mar 25 2013 Peter Robinson 1.10-2 -- Add missing distag - -* Tue Feb 19 2013 Tomáš Mráz - 1.10-1 -- new upstream release - -* Fri Feb 8 2013 Tomáš Mráz - 1.9.911-0.2.20130107git6f9bc5d -- drop --vendor from desktop-file-install call - -* Tue Jan 8 2013 Tom Callaway - 1.9.911-0.1.20130107git6f9bc5d -- update to 1.9.911 checkout from github -- build for gnome3 - -* Sun Jul 22 2012 Fedora Release Engineering - 1.9.4-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Tue Feb 28 2012 Fedora Release Engineering - 1.9.4-5 -- Rebuilt for c++ ABI breakage - -* Sat Jan 14 2012 Fedora Release Engineering - 1.9.4-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Mon Nov 7 2011 Tomas Mraz - 1.9.4-3 -- rebuilt with new libpng - -* Tue Jun 28 2011 Tomas Mraz - 1.9.4-2 -- no longer needs gnet2 - -* Wed Apr 06 2011 Rahul Sundaram - 1.9.4-1 -- New upstream bug fix release. Closes rhbz#693958 -- https://github.com/rcaelers/workrave/blob/b491d9b5054b5571d5b4ff0f6c9137133735129d/NEWS -- Drop buildroot definition and clean section - -* Thu Feb 10 2011 Tomas Mraz - 1.9.3-4 -- due to changes in gnome applet API we have to build without - gnome support - -* Mon Feb 07 2011 Fedora Release Engineering - 1.9.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Thu Feb 3 2011 Tomas Mraz - 1.9.3-2 -- rebuilt with new gnome-panel - -* Fri Dec 17 2010 Tomas Mraz - 1.9.3-1 -- new upstream release with bug fixes and usability improvements - -* Wed Nov 3 2010 Tomas Mraz - 1.9.2-1 -- new upstream release hopefully fixing at least some of the aborts - -* Mon Apr 26 2010 Tomas Mraz - 1.9.1-4 -- better guard for BadWindow errors in input monitor (#566156) - -* Wed Mar 17 2010 Tomas Mraz - 1.9.1-3 -- fix FTBFS (#564917) - -* Thu Jan 28 2010 Tomas Mraz - 1.9.1-2 -- do not build against gdome2 - not too useful optional feature - -* Tue Dec 8 2009 Tomas Mraz - 1.9.1-1 -- new upstream version - -* Mon Jul 27 2009 Fedora Release Engineering - 1.9.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Fri Feb 27 2009 Tomas Mraz - 1.9.0-3 -- fix build with new gcc 4.4 and glibc - -* Fri Sep 26 2008 Tomas Mraz - 1.9.0-1 -- new upstream version - -* Fri Apr 4 2008 Tomas Mraz - 1.8.5-4 -- fix locking/unlocking with gnome-screensaver (#207058) -- make it build with current libsigc++ - -* Wed Feb 20 2008 Fedora Release Engineering - 1.8.5-3 -- Autorebuild for GCC 4.3 - -* Tue Feb 19 2008 Tomas Mraz - 1.8.5-2 -- make it build on gcc-4.3 - -* Mon Jan 7 2008 Tomas Mraz - 1.8.5-1 -- upgrade to latest upstream version - -* Wed Aug 22 2007 Tomas Mraz - 1.8.4-4 -- applet counters don't start properly -- license tag fix - -* Wed Apr 18 2007 Tomas Mraz - 1.8.4-3 -- fixed applet crash (#236543) - -* Mon Mar 26 2007 Tomas Mraz - 1.8.4-2 -- new upstream version -- add datadir/pixmaps/workrave to files (#233815) - -* Thu Sep 7 2006 Tomas Mraz - 1.8.3-2 -- rebuilt for FC6 - -* Wed May 31 2006 Tomas Mraz - 1.8.3-1 -- New upstream version - -* Wed Feb 15 2006 Tomas Mraz - 1.8.2-2 -- Rebuilt with updated gcc - -* Thu Feb 2 2006 Tomas Mraz - 1.8.2-1 -- Updated version, dropped obsolete patch -- Added missing buildrequires for modular X -- Fixed compilation on gcc-4.1 - -* Sat Oct 22 2005 Tomas Mraz - 1.8.1-4 -- Added a desktop file -- Added find_lang -- Fixed wrong install extension for message translations - -* Thu Oct 20 2005 Tomas Mraz - 1.8.1-3 -- Removed Prefix:, added BuildRequires gnome-panel-devel -- Group: Applications/Productivity - -* Thu Sep 22 2005 Tomas Mraz - 1.8.1-2 -- Initial package, reused spec from package by Steve Ratcliffe diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..5204a84 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Orphaned for 6+ weeks diff --git a/sources b/sources deleted file mode 100644 index 6928137..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (workrave-v1_11_0_beta_13.tar.gz) = b0f24572d41d072d5fcc383ef2c01408a3f5329f2c48432041b19705eeb637f7eee030b4b659741a1dbcbc676430740cde64f7f0647aa9de77e8732c3157c3e1 diff --git a/workrave.spec b/workrave.spec deleted file mode 100644 index 105702f..0000000 --- a/workrave.spec +++ /dev/null @@ -1,229 +0,0 @@ -%bcond gnome 1 -%bcond gnome40 1 -%bcond gnome45 %[0%{?fedora} || 0%{?rhel} >= 10] -%bcond gnome_flashback %{undefined flatpak} -%bcond mate %{undefined flatpak} -%bcond xfce %{undefined flatpak} - -%global app_id org.workrave.Workrave - -Name: workrave -Version: 1.11.0~beta.13 -Release: %autorelease -Summary: Program that assists in the recovery and prevention of RSI -# Based on older packages by Dag Wieers and Steve Ratcliffe -License: GPL-3.0-or-later AND LGPL-2.0-or-later -URL: https://workrave.org/ -%global tag %(echo %{version} | sed -e 's/[\\.~]/_/g') -Source: https://github.com/rcaelers/workrave/archive/v%{tag}/%{name}-v%{tag}.tar.gz - -BuildRequires: cmake -BuildRequires: desktop-file-utils -BuildRequires: gettext -BuildRequires: gcc-c++ -BuildRequires: libappstream-glib -# Base dependencies -BuildRequires: boost-devel -BuildRequires: python3-devel -BuildRequires: python3-jinja2 -# Gtk+3 interface -BuildRequires: pkgconfig(glib-2.0) >= 2.56.0 -BuildRequires: pkgconfig(gio-2.0) >= 2.56.0 -BuildRequires: pkgconfig(gtk+-3.0) >= 3.22.0 -BuildRequires: pkgconfig(glibmm-2.4) >= 2.28.0 -BuildRequires: pkgconfig(gtkmm-3.0) >= 3.22.0 -# Sound support -BuildRequires: pkgconfig(gstreamer-1.0) -BuildRequires: pkgconfig(libpulse) >= 0.9.15 -BuildRequires: pkgconfig(libpulse-mainloop-glib) >= 0.9.15 -# Wayland support -BuildRequires: pkgconfig(wayland-client) -BuildRequires: pkgconfig(wayland-scanner) -# X11 support -BuildRequires: libX11-devel -BuildRequires: libXScrnSaver-devel -BuildRequires: libXtst-devel -# Desktop applets -BuildRequires: pkgconfig(ayatana-appindicator3-0.1) -BuildRequires: pkgconfig(dbusmenu-glib-0.4) -BuildRequires: pkgconfig(dbusmenu-gtk3-0.4) -BuildRequires: pkgconfig(gobject-introspection-1.0) -%if %{with gnome_flashback} -BuildRequires: pkgconfig(libgnome-panel) -%endif -%if %{with gnome40} -BuildRequires: pkgconfig(gtk4) -%endif -%if %{with xfce} -BuildRequires: pkgconfig(libxfce4panel-2.0) >= 4.12 -%endif -%if %{with mate} -BuildRequires: pkgconfig(libmatepanelapplet-4.0) >= 1.20.0 -%endif -# Logging -BuildRequires: cmake(fmt) -BuildRequires: cmake(spdlog) - -Requires: dbus-common -Requires: hicolor-icon-theme -Recommends: (%{name}-cinnamon if cinnamon) -Recommends: (%{name}-gnome if gnome-shell) -Recommends: (%{name}-gnome-flashback if gnome-panel) -Recommends: (%{name}-mate if mate-panel) -Recommends: (%{name}-xfce if xfce4-panel) -Recommends: gstreamer1-plugins-base -Recommends: gstreamer1-plugins-good -Obsoletes: %{name}-devel < %{version}-%{release} - -# https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval -ExcludeArch: %{ix86} - -%global _description Workrave is a program that assists in the recovery and prevention of\ -Repetitive Strain Injury (RSI). The program frequently alerts you to\ -take micro-pauses, rest breaks and restricts you to your daily limit. - -%description -%{_description} - -%package cinnamon -Requires: %{name}%{?_isa} = %{version}-%{release} -Summary: Workrave applet for Cinnamon desktop - -%description cinnamon -%{_description} - -This package provides an applet for the Cinnamon desktop. - -%package gnome -Requires: %{name}%{?_isa} = %{version}-%{release} -Summary: Workrave applet for GNOME desktop - -%description gnome -%{_description} - -This package provides an applet for the GNOME desktop. - -%package gnome-flashback -Requires: %{name}%{?_isa} = %{version}-%{release} -Summary: Workrave applet for GNOME Flashback - -%description gnome-flashback -%{_description} - -This package provides an applet for the GNOME Flashback panel. - -%package mate -Requires: %{name}%{?_isa} = %{version}-%{release} -Summary: Workrave applet for MATE - -%description mate -%{_description} - -This package provides an applet for the MATE panel. - -%package xfce -Requires: %{name}%{?_isa} = %{version}-%{release} -Summary: Workrave applet for Xfce - -%description xfce -%{_description} - -This package provides an applet for the Xfce panel. - - -%prep -%autosetup -n workrave-%{tag} -p1 - -# use versioned python command -%py3_shebang_fix libs/dbus/bin/dbusgen.py - - -%build -%cmake \ - -DWITH_GNOME_CLASSIC_PANEL:BOOL=%{?with_gnome_flashback:ON}%{!?with_gnome_flashback:OFF} \ - -DWITH_GNOME45:BOOL=%{?with_gnome45:ON}%{!?with_gnome45:OFF} \ - -DWITH_MATE:BOOL=%{?with_mate:ON}%{!?with_mate:OFF} \ - -DWITH_XFCE4:BOOL=%{?with_xfce:ON}%{!?with_xfce:OFF} \ - -DWITH_DBUS:BOOL=ON \ - -DWITH_GSTREAMER:BOOL=ON \ - -DWITH_PULSE:BOOL=ON \ - -DWITH_DBUSMENU:BOOL=ON \ - -DWITH_INDICATOR:BOOL=ON \ - -DWITH_APPINDICATOR:BOOL=ON \ - -DWITH_WAYLAND:BOOL=ON \ - %{nil} - -%cmake_build - - -%install -%cmake_install - -# workrave does not provide a public API -rm -f %{buildroot}%{_datadir}/gir-1.0/*.gir -rm -f %{buildroot}%{_libdir}/*.so -# indicators need to be enabled to build GIR but are not needed otherwise -rm -f %{buildroot}%{_libdir}/*indicators3/7/libworkrave.so* - -# fix appstream ID -appstream-util modify %{buildroot}%{_metainfodir}/%{app_id}.metainfo.xml id %{app_id} - -%find_lang %{name} - - -%check -desktop-file-validate %{buildroot}%{_datadir}/applications/%{app_id}.desktop -appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{app_id}.metainfo.xml - - -%files -f %{name}.lang -%doc AUTHORS COPYING NEWS README.md -%{_bindir}/%{name} -%{_datadir}/applications/%{app_id}.desktop -%{_datadir}/dbus-1/services/%{app_id}.service -%{_datadir}/glib-2.0/schemas/org.workrave.*.xml -%{_datadir}/icons/hicolor/*/apps/%{name}.* -%{_datadir}/sounds/%{name}/ -%{_datadir}/%{name}/ -%{_metainfodir}/%{app_id}.metainfo.xml -# support library for gtk3 applets -%{_libdir}/girepository-1.0/Workrave-1.0.typelib -%{_libdir}/libworkrave-private-1.0.so.* - -%files cinnamon -%dir %{_datadir}/cinnamon/ -%dir %{_datadir}/cinnamon/applets/ -%{_datadir}/cinnamon/applets/workrave@workrave.org/ - -%if %{with gnome} -%files gnome -%if %{with gnome40} -%{_libdir}/girepository-1.0/Workrave-2.0.typelib -%{_libdir}/libworkrave-gtk4-private-1.0.so.* -%endif -%dir %{_datadir}/gnome-shell/ -%dir %{_datadir}/gnome-shell/extensions/ -%{_datadir}/gnome-shell/extensions/workrave@workrave.org/ -%endif - -%if %{with gnome_flashback} -%files gnome-flashback -%{_libdir}/gnome-panel/modules/libworkrave-applet.so -%endif - -%if %{with xfce} -%files xfce -%{_libdir}/xfce4/panel/plugins/libworkrave-plugin.so -%{_datadir}/xfce4/panel/plugins/workrave-xfce-applet.desktop -%endif - -%if %{with mate} -%files mate -%{_libdir}/mate-applets/workrave-applet -%{_datadir}/dbus-1/services/org.mate.panel.applet.WorkraveAppletFactory.service -%{_datadir}/mate-panel/applets/org.workrave.WorkraveApplet.mate-panel-applet -%{_datadir}/mate-panel/ui/workrave-menu.xml -%endif - -%changelog -%autochangelog From 06cb30b32a7d152bc2137616dcd69e3fe10f10bb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 7 Apr 2025 09:32:19 +0000 Subject: [PATCH 78/90] Unretirement request: pagure.io/releng/issue/12630 Revert "Orphaned for 6+ weeks" This reverts commit 630c7e05debe7e25e0ef3e00b060ca7da021db25. Signed-off-by: Fedora Release Engineering --- .gitignore | 20 +++++ changelog | 227 +++++++++++++++++++++++++++++++++++++++++++++++++ dead.package | 1 - sources | 1 + workrave.spec | 229 ++++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 477 insertions(+), 1 deletion(-) create mode 100644 .gitignore create mode 100644 changelog delete mode 100644 dead.package create mode 100644 sources create mode 100644 workrave.spec diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..79fee17 --- /dev/null +++ b/.gitignore @@ -0,0 +1,20 @@ +/results_workrave +/workrave*rpm +workrave-1.9.1.tar.gz +/workrave-1.9.2.tar.gz +/workrave-1.9.3.tar.gz +/workrave-1.9.911-6f9bc5d.tar.gz +/workrave-1.10.tar.gz +/workrave-v1_10_10.tar.gz +/workrave-v1_10_15.tar.gz +/workrave-v1_10_16.tar.gz +/workrave-v1_10_20.tar.gz +/workrave-v1_10_37.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 +/workrave-v1_10_51_1.tar.gz +/workrave-v1_10_52.tar.gz +/workrave-v1_11_0_beta_12.tar.gz +/workrave-v1_11_0_beta_13.tar.gz diff --git a/changelog b/changelog new file mode 100644 index 0000000..f929c6f --- /dev/null +++ b/changelog @@ -0,0 +1,227 @@ +* Sat Jul 22 2023 Fedora Release Engineering - 1.10.50-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Sat Jan 21 2023 Fedora Release Engineering - 1.10.50-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* 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 + +* Sat Jan 22 2022 Fedora Release Engineering - 1.10.49-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Sun Jan 09 2022 Mukundan Ragavan - 1.10.49-1 +- Update to 1.10.49 +- Fixes rhbz#1986369 and rhbz#2035023 + +* Fri Jul 23 2021 Fedora Release Engineering - 1.10.45-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Thu May 06 2021 Mukundan Ragavan - 1.10.45-1 +- Update to 1.10.45 +- Drop upstreamed patch + +* Mon Feb 08 2021 Mukundan Ragavan - 1.10.44-3 +- Build against xfce-4.16 + +* Wed Jan 27 2021 Fedora Release Engineering - 1.10.44-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Fri Oct 02 2020 Lukas Zapletal - 1.10.44-1 +- new version + +* Wed Jul 29 2020 Fedora Release Engineering - 1.10.37-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Mar 27 2020 Lukas Zapletal - 1.10.37-1 +- new version + +* Fri Jan 31 2020 Fedora Release Engineering - 1.10.20-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Sat Jul 27 2019 Fedora Release Engineering - 1.10.20-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri Apr 12 2019 Lukas Zapletal - 1.10.20-5 +- Updated X11 and python3 deps + +* Sun Feb 03 2019 Fedora Release Engineering - 1.10.20-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sat Jul 14 2018 Fedora Release Engineering - 1.10.20-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Fri Feb 09 2018 Fedora Release Engineering - 1.10.20-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Tue Nov 14 2017 Yaakov Selkowitz - 1.10.20-1 +- new version (#1508256) + +* Thu Aug 03 2017 Fedora Release Engineering - 1.10.16-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 1.10.16-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat Feb 11 2017 Fedora Release Engineering - 1.10.16-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Fri Sep 16 2016 Yaakov Selkowitz - 1.10.16-1 +- new version (#1376625) + +* Thu May 12 2016 Yaakov Selkowitz - 1.10.15-1 +- new version (#1321458) + +* Fri Feb 26 2016 Yaakov Selkowitz - 1.10.10-1 +- new version +- Add Cinnamon, Indicator, MATE, Xfce applets +- Cleanup spec + +* Fri Feb 05 2016 Fedora Release Engineering - 1.10-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Fri Jun 19 2015 Fedora Release Engineering - 1.10-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sat May 02 2015 Kalev Lember - 1.10-8 +- Rebuilt for GCC 5 C++11 ABI change + +* Mon Aug 18 2014 Fedora Release Engineering - 1.10-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Tue Jul 22 2014 Kalev Lember - 1.10-6 +- Rebuilt for gobject-introspection 1.41.4 + +* Sun Jun 08 2014 Fedora Release Engineering - 1.10-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Sun Aug 04 2013 Fedora Release Engineering - 1.10-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Fri May 3 2013 Tomáš Mráz - 1.10-3 +- do not build the panel applet + +* Mon Mar 25 2013 Peter Robinson 1.10-2 +- Add missing distag + +* Tue Feb 19 2013 Tomáš Mráz - 1.10-1 +- new upstream release + +* Fri Feb 8 2013 Tomáš Mráz - 1.9.911-0.2.20130107git6f9bc5d +- drop --vendor from desktop-file-install call + +* Tue Jan 8 2013 Tom Callaway - 1.9.911-0.1.20130107git6f9bc5d +- update to 1.9.911 checkout from github +- build for gnome3 + +* Sun Jul 22 2012 Fedora Release Engineering - 1.9.4-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Tue Feb 28 2012 Fedora Release Engineering - 1.9.4-5 +- Rebuilt for c++ ABI breakage + +* Sat Jan 14 2012 Fedora Release Engineering - 1.9.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Mon Nov 7 2011 Tomas Mraz - 1.9.4-3 +- rebuilt with new libpng + +* Tue Jun 28 2011 Tomas Mraz - 1.9.4-2 +- no longer needs gnet2 + +* Wed Apr 06 2011 Rahul Sundaram - 1.9.4-1 +- New upstream bug fix release. Closes rhbz#693958 +- https://github.com/rcaelers/workrave/blob/b491d9b5054b5571d5b4ff0f6c9137133735129d/NEWS +- Drop buildroot definition and clean section + +* Thu Feb 10 2011 Tomas Mraz - 1.9.3-4 +- due to changes in gnome applet API we have to build without + gnome support + +* Mon Feb 07 2011 Fedora Release Engineering - 1.9.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Thu Feb 3 2011 Tomas Mraz - 1.9.3-2 +- rebuilt with new gnome-panel + +* Fri Dec 17 2010 Tomas Mraz - 1.9.3-1 +- new upstream release with bug fixes and usability improvements + +* Wed Nov 3 2010 Tomas Mraz - 1.9.2-1 +- new upstream release hopefully fixing at least some of the aborts + +* Mon Apr 26 2010 Tomas Mraz - 1.9.1-4 +- better guard for BadWindow errors in input monitor (#566156) + +* Wed Mar 17 2010 Tomas Mraz - 1.9.1-3 +- fix FTBFS (#564917) + +* Thu Jan 28 2010 Tomas Mraz - 1.9.1-2 +- do not build against gdome2 - not too useful optional feature + +* Tue Dec 8 2009 Tomas Mraz - 1.9.1-1 +- new upstream version + +* Mon Jul 27 2009 Fedora Release Engineering - 1.9.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Fri Feb 27 2009 Tomas Mraz - 1.9.0-3 +- fix build with new gcc 4.4 and glibc + +* Fri Sep 26 2008 Tomas Mraz - 1.9.0-1 +- new upstream version + +* Fri Apr 4 2008 Tomas Mraz - 1.8.5-4 +- fix locking/unlocking with gnome-screensaver (#207058) +- make it build with current libsigc++ + +* Wed Feb 20 2008 Fedora Release Engineering - 1.8.5-3 +- Autorebuild for GCC 4.3 + +* Tue Feb 19 2008 Tomas Mraz - 1.8.5-2 +- make it build on gcc-4.3 + +* Mon Jan 7 2008 Tomas Mraz - 1.8.5-1 +- upgrade to latest upstream version + +* Wed Aug 22 2007 Tomas Mraz - 1.8.4-4 +- applet counters don't start properly +- license tag fix + +* Wed Apr 18 2007 Tomas Mraz - 1.8.4-3 +- fixed applet crash (#236543) + +* Mon Mar 26 2007 Tomas Mraz - 1.8.4-2 +- new upstream version +- add datadir/pixmaps/workrave to files (#233815) + +* Thu Sep 7 2006 Tomas Mraz - 1.8.3-2 +- rebuilt for FC6 + +* Wed May 31 2006 Tomas Mraz - 1.8.3-1 +- New upstream version + +* Wed Feb 15 2006 Tomas Mraz - 1.8.2-2 +- Rebuilt with updated gcc + +* Thu Feb 2 2006 Tomas Mraz - 1.8.2-1 +- Updated version, dropped obsolete patch +- Added missing buildrequires for modular X +- Fixed compilation on gcc-4.1 + +* Sat Oct 22 2005 Tomas Mraz - 1.8.1-4 +- Added a desktop file +- Added find_lang +- Fixed wrong install extension for message translations + +* Thu Oct 20 2005 Tomas Mraz - 1.8.1-3 +- Removed Prefix:, added BuildRequires gnome-panel-devel +- Group: Applications/Productivity + +* Thu Sep 22 2005 Tomas Mraz - 1.8.1-2 +- Initial package, reused spec from package by Steve Ratcliffe diff --git a/dead.package b/dead.package deleted file mode 100644 index 5204a84..0000000 --- a/dead.package +++ /dev/null @@ -1 +0,0 @@ -Orphaned for 6+ weeks diff --git a/sources b/sources new file mode 100644 index 0000000..6928137 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (workrave-v1_11_0_beta_13.tar.gz) = b0f24572d41d072d5fcc383ef2c01408a3f5329f2c48432041b19705eeb637f7eee030b4b659741a1dbcbc676430740cde64f7f0647aa9de77e8732c3157c3e1 diff --git a/workrave.spec b/workrave.spec new file mode 100644 index 0000000..105702f --- /dev/null +++ b/workrave.spec @@ -0,0 +1,229 @@ +%bcond gnome 1 +%bcond gnome40 1 +%bcond gnome45 %[0%{?fedora} || 0%{?rhel} >= 10] +%bcond gnome_flashback %{undefined flatpak} +%bcond mate %{undefined flatpak} +%bcond xfce %{undefined flatpak} + +%global app_id org.workrave.Workrave + +Name: workrave +Version: 1.11.0~beta.13 +Release: %autorelease +Summary: Program that assists in the recovery and prevention of RSI +# Based on older packages by Dag Wieers and Steve Ratcliffe +License: GPL-3.0-or-later AND LGPL-2.0-or-later +URL: https://workrave.org/ +%global tag %(echo %{version} | sed -e 's/[\\.~]/_/g') +Source: https://github.com/rcaelers/workrave/archive/v%{tag}/%{name}-v%{tag}.tar.gz + +BuildRequires: cmake +BuildRequires: desktop-file-utils +BuildRequires: gettext +BuildRequires: gcc-c++ +BuildRequires: libappstream-glib +# Base dependencies +BuildRequires: boost-devel +BuildRequires: python3-devel +BuildRequires: python3-jinja2 +# Gtk+3 interface +BuildRequires: pkgconfig(glib-2.0) >= 2.56.0 +BuildRequires: pkgconfig(gio-2.0) >= 2.56.0 +BuildRequires: pkgconfig(gtk+-3.0) >= 3.22.0 +BuildRequires: pkgconfig(glibmm-2.4) >= 2.28.0 +BuildRequires: pkgconfig(gtkmm-3.0) >= 3.22.0 +# Sound support +BuildRequires: pkgconfig(gstreamer-1.0) +BuildRequires: pkgconfig(libpulse) >= 0.9.15 +BuildRequires: pkgconfig(libpulse-mainloop-glib) >= 0.9.15 +# Wayland support +BuildRequires: pkgconfig(wayland-client) +BuildRequires: pkgconfig(wayland-scanner) +# X11 support +BuildRequires: libX11-devel +BuildRequires: libXScrnSaver-devel +BuildRequires: libXtst-devel +# Desktop applets +BuildRequires: pkgconfig(ayatana-appindicator3-0.1) +BuildRequires: pkgconfig(dbusmenu-glib-0.4) +BuildRequires: pkgconfig(dbusmenu-gtk3-0.4) +BuildRequires: pkgconfig(gobject-introspection-1.0) +%if %{with gnome_flashback} +BuildRequires: pkgconfig(libgnome-panel) +%endif +%if %{with gnome40} +BuildRequires: pkgconfig(gtk4) +%endif +%if %{with xfce} +BuildRequires: pkgconfig(libxfce4panel-2.0) >= 4.12 +%endif +%if %{with mate} +BuildRequires: pkgconfig(libmatepanelapplet-4.0) >= 1.20.0 +%endif +# Logging +BuildRequires: cmake(fmt) +BuildRequires: cmake(spdlog) + +Requires: dbus-common +Requires: hicolor-icon-theme +Recommends: (%{name}-cinnamon if cinnamon) +Recommends: (%{name}-gnome if gnome-shell) +Recommends: (%{name}-gnome-flashback if gnome-panel) +Recommends: (%{name}-mate if mate-panel) +Recommends: (%{name}-xfce if xfce4-panel) +Recommends: gstreamer1-plugins-base +Recommends: gstreamer1-plugins-good +Obsoletes: %{name}-devel < %{version}-%{release} + +# https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval +ExcludeArch: %{ix86} + +%global _description Workrave is a program that assists in the recovery and prevention of\ +Repetitive Strain Injury (RSI). The program frequently alerts you to\ +take micro-pauses, rest breaks and restricts you to your daily limit. + +%description +%{_description} + +%package cinnamon +Requires: %{name}%{?_isa} = %{version}-%{release} +Summary: Workrave applet for Cinnamon desktop + +%description cinnamon +%{_description} + +This package provides an applet for the Cinnamon desktop. + +%package gnome +Requires: %{name}%{?_isa} = %{version}-%{release} +Summary: Workrave applet for GNOME desktop + +%description gnome +%{_description} + +This package provides an applet for the GNOME desktop. + +%package gnome-flashback +Requires: %{name}%{?_isa} = %{version}-%{release} +Summary: Workrave applet for GNOME Flashback + +%description gnome-flashback +%{_description} + +This package provides an applet for the GNOME Flashback panel. + +%package mate +Requires: %{name}%{?_isa} = %{version}-%{release} +Summary: Workrave applet for MATE + +%description mate +%{_description} + +This package provides an applet for the MATE panel. + +%package xfce +Requires: %{name}%{?_isa} = %{version}-%{release} +Summary: Workrave applet for Xfce + +%description xfce +%{_description} + +This package provides an applet for the Xfce panel. + + +%prep +%autosetup -n workrave-%{tag} -p1 + +# use versioned python command +%py3_shebang_fix libs/dbus/bin/dbusgen.py + + +%build +%cmake \ + -DWITH_GNOME_CLASSIC_PANEL:BOOL=%{?with_gnome_flashback:ON}%{!?with_gnome_flashback:OFF} \ + -DWITH_GNOME45:BOOL=%{?with_gnome45:ON}%{!?with_gnome45:OFF} \ + -DWITH_MATE:BOOL=%{?with_mate:ON}%{!?with_mate:OFF} \ + -DWITH_XFCE4:BOOL=%{?with_xfce:ON}%{!?with_xfce:OFF} \ + -DWITH_DBUS:BOOL=ON \ + -DWITH_GSTREAMER:BOOL=ON \ + -DWITH_PULSE:BOOL=ON \ + -DWITH_DBUSMENU:BOOL=ON \ + -DWITH_INDICATOR:BOOL=ON \ + -DWITH_APPINDICATOR:BOOL=ON \ + -DWITH_WAYLAND:BOOL=ON \ + %{nil} + +%cmake_build + + +%install +%cmake_install + +# workrave does not provide a public API +rm -f %{buildroot}%{_datadir}/gir-1.0/*.gir +rm -f %{buildroot}%{_libdir}/*.so +# indicators need to be enabled to build GIR but are not needed otherwise +rm -f %{buildroot}%{_libdir}/*indicators3/7/libworkrave.so* + +# fix appstream ID +appstream-util modify %{buildroot}%{_metainfodir}/%{app_id}.metainfo.xml id %{app_id} + +%find_lang %{name} + + +%check +desktop-file-validate %{buildroot}%{_datadir}/applications/%{app_id}.desktop +appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{app_id}.metainfo.xml + + +%files -f %{name}.lang +%doc AUTHORS COPYING NEWS README.md +%{_bindir}/%{name} +%{_datadir}/applications/%{app_id}.desktop +%{_datadir}/dbus-1/services/%{app_id}.service +%{_datadir}/glib-2.0/schemas/org.workrave.*.xml +%{_datadir}/icons/hicolor/*/apps/%{name}.* +%{_datadir}/sounds/%{name}/ +%{_datadir}/%{name}/ +%{_metainfodir}/%{app_id}.metainfo.xml +# support library for gtk3 applets +%{_libdir}/girepository-1.0/Workrave-1.0.typelib +%{_libdir}/libworkrave-private-1.0.so.* + +%files cinnamon +%dir %{_datadir}/cinnamon/ +%dir %{_datadir}/cinnamon/applets/ +%{_datadir}/cinnamon/applets/workrave@workrave.org/ + +%if %{with gnome} +%files gnome +%if %{with gnome40} +%{_libdir}/girepository-1.0/Workrave-2.0.typelib +%{_libdir}/libworkrave-gtk4-private-1.0.so.* +%endif +%dir %{_datadir}/gnome-shell/ +%dir %{_datadir}/gnome-shell/extensions/ +%{_datadir}/gnome-shell/extensions/workrave@workrave.org/ +%endif + +%if %{with gnome_flashback} +%files gnome-flashback +%{_libdir}/gnome-panel/modules/libworkrave-applet.so +%endif + +%if %{with xfce} +%files xfce +%{_libdir}/xfce4/panel/plugins/libworkrave-plugin.so +%{_datadir}/xfce4/panel/plugins/workrave-xfce-applet.desktop +%endif + +%if %{with mate} +%files mate +%{_libdir}/mate-applets/workrave-applet +%{_datadir}/dbus-1/services/org.mate.panel.applet.WorkraveAppletFactory.service +%{_datadir}/mate-panel/applets/org.workrave.WorkraveApplet.mate-panel-applet +%{_datadir}/mate-panel/ui/workrave-menu.xml +%endif + +%changelog +%autochangelog From f416479277b6ce3ef7f230f0755ac4b56ccc6aad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Wojni=C5=82owicz?= Date: Tue, 8 Apr 2025 16:14:06 +0200 Subject: [PATCH 79/90] Unretirement import (fedora#2351398). --- .gitignore | 1 + 1be2073.patch | 206 ++++++++++++++++++++++++++++++++++++++++++++++++++ sources | 2 +- workrave.spec | 84 ++++++++++++++------ 4 files changed, 267 insertions(+), 26 deletions(-) create mode 100644 1be2073.patch diff --git a/.gitignore b/.gitignore index 79fee17..e316004 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ workrave-1.9.1.tar.gz /workrave-v1_10_52.tar.gz /workrave-v1_11_0_beta_12.tar.gz /workrave-v1_11_0_beta_13.tar.gz +/workrave-v1_11_0_rc_1.tar.gz diff --git a/1be2073.patch b/1be2073.patch new file mode 100644 index 0000000..692f402 --- /dev/null +++ b/1be2073.patch @@ -0,0 +1,206 @@ +From 1be2073a41691ff4db909b1b04de465c3e2c92dc Mon Sep 17 00:00:00 2001 +From: Rob Caelers +Date: Sat, 22 Mar 2025 17:57:22 +0100 +Subject: [PATCH] Make muilti-monitor support most robust (#606) + +--- + ui/app/Application.cc | 16 ++++++++++--- + ui/app/toolkits/gtkmm/IToolkitPrivate.hh | 3 ++- + ui/app/toolkits/gtkmm/MainWindow.cc | 14 ++++++++++-- + ui/app/toolkits/gtkmm/Toolkit.cc | 29 +++++++++++++++++++++--- + ui/app/toolkits/gtkmm/Toolkit.hh | 2 +- + ui/app/toolkits/qt/IToolkitPrivate.hh | 2 +- + 6 files changed, 55 insertions(+), 11 deletions(-) + +diff --git a/ui/app/Application.cc b/ui/app/Application.cc +index a88e6e49f..f3f7751b0 100644 +--- a/ui/app/Application.cc ++++ b/ui/app/Application.cc +@@ -152,6 +152,7 @@ Application::init_configurator() + { + if (std::filesystem::is_regular_file(ini_file)) + { ++ spdlog::info("Using INI configuration file: {}", ini_file); + configurator = workrave::config::ConfiguratorFactory::create(workrave::config::ConfigFileFormat::Ini); + configurator->load(ini_file); + } +@@ -174,6 +175,7 @@ Application::init_configurator() + #endif + if (!configFile.empty()) + { ++ spdlog::info("Using XML configuration file: {}", configFile); + configurator->load(configFile); + } + } +@@ -186,6 +188,7 @@ Application::init_configurator() + + if (configurator) + { ++ spdlog::info("Using INI configuration file: {}", ini_file); + configurator->load(ini_file); + configurator->save(); + } +@@ -432,7 +435,11 @@ Application::create_prelude_window(BreakId break_id) + + for (int i = 0; i < toolkit->get_head_count(); i++) + { +- prelude_windows.push_back(toolkit->create_prelude_window(i, break_id)); ++ auto prelude_window = toolkit->create_prelude_window(i, break_id); ++ if (prelude_window) ++ { ++ prelude_windows.push_back(prelude_window); ++ } + } + } + +@@ -479,8 +486,11 @@ Application::create_break_window(BreakId break_id, workrave::utils::Flagscreate_break_window(i, break_id, break_flags); + +- break_windows.push_back(break_window); +- break_window->init(); ++ if (break_window) ++ { ++ break_windows.push_back(break_window); ++ break_window->init(); ++ } + } + } + +diff --git a/ui/app/toolkits/gtkmm/IToolkitPrivate.hh b/ui/app/toolkits/gtkmm/IToolkitPrivate.hh +index abe3e5dbd..15f966514 100644 +--- a/ui/app/toolkits/gtkmm/IToolkitPrivate.hh ++++ b/ui/app/toolkits/gtkmm/IToolkitPrivate.hh +@@ -19,6 +19,7 @@ + #define ITOOLKIT_PRIVATE_HH + + #include ++#include + + #include "HeadInfo.hh" + +@@ -27,7 +28,7 @@ class IToolkitPrivate + public: + virtual ~IToolkitPrivate() = default; + +- virtual HeadInfo get_head_info(int screen_index) const = 0; ++ virtual std::optional get_head_info(int screen_index) const = 0; + virtual void attach_menu(Gtk::Menu *menu) = 0; + }; + +diff --git a/ui/app/toolkits/gtkmm/MainWindow.cc b/ui/app/toolkits/gtkmm/MainWindow.cc +index 74af375b9..96a176664 100644 +--- a/ui/app/toolkits/gtkmm/MainWindow.cc ++++ b/ui/app/toolkits/gtkmm/MainWindow.cc +@@ -351,7 +351,12 @@ MainWindow::convert_display_to_monitor(int &x, int &y) + + for (int i = 0; i < app->get_toolkit()->get_head_count(); i++) + { +- HeadInfo head = toolkit_priv->get_head_info(i); ++ auto optional_head = toolkit_priv->get_head_info(i); ++ if (!optional_head) ++ { ++ continue; ++ } ++ HeadInfo head = *optional_head; + + int left = head.get_x(); + int top = head.get_y(); +@@ -383,7 +388,12 @@ void + MainWindow::convert_monitor_to_display(int &x, int &y, int head) + { + auto toolkit_priv = std::dynamic_pointer_cast(app->get_toolkit()); +- HeadInfo h = toolkit_priv->get_head_info(head); ++ auto optional_head = toolkit_priv->get_head_info(head); ++ if (!optional_head) ++ { ++ return; ++ } ++ HeadInfo h = *optional_head; + + if (x < 0) + { +diff --git a/ui/app/toolkits/gtkmm/Toolkit.cc b/ui/app/toolkits/gtkmm/Toolkit.cc +index 76c456780..8fccf86b6 100644 +--- a/ui/app/toolkits/gtkmm/Toolkit.cc ++++ b/ui/app/toolkits/gtkmm/Toolkit.cc +@@ -145,11 +145,22 @@ Toolkit::run() + gapp->run(); + } + +-HeadInfo ++std::optional + Toolkit::get_head_info(int screen_index) const + { + Glib::RefPtr display = Gdk::Display::get_default(); ++ if (!display) ++ { ++ logger->error("Failed to get default display"); ++ return {}; ++ } ++ + Glib::RefPtr monitor = display->get_monitor(screen_index); ++ if (!monitor) ++ { ++ logger->error("Failed to get monitor for screen index {}", screen_index); ++ return {}; ++ } + + HeadInfo head; + head.primary = monitor->is_primary(); +@@ -178,7 +189,13 @@ Toolkit::create_break_window(int screen_index, BreakId break_id, BreakFlags brea + { + IBreakWindow::Ptr ret; + +- HeadInfo head = get_head_info(screen_index); ++ auto optional_head = get_head_info(screen_index); ++ if (!optional_head) ++ { ++ logger->error("Failed to retrieve monitor info for screen index {}", screen_index); ++ return nullptr; ++ } ++ HeadInfo head = *optional_head; + + BlockMode block_mode = GUIConfig::block_mode()(); + +@@ -201,7 +218,13 @@ Toolkit::create_break_window(int screen_index, BreakId break_id, BreakFlags brea + IPreludeWindow::Ptr + Toolkit::create_prelude_window(int screen_index, workrave::BreakId break_id) + { +- HeadInfo head = get_head_info(screen_index); ++ auto optional_head = get_head_info(screen_index); ++ if (!optional_head) ++ { ++ logger->error("Failed to retrieve monitor info for screen index {}", screen_index); ++ return nullptr; ++ } ++ HeadInfo head = *optional_head; + return std::make_shared(head, break_id); + } + +diff --git a/ui/app/toolkits/gtkmm/Toolkit.hh b/ui/app/toolkits/gtkmm/Toolkit.hh +index 159a7815d..d337cd563 100644 +--- a/ui/app/toolkits/gtkmm/Toolkit.hh ++++ b/ui/app/toolkits/gtkmm/Toolkit.hh +@@ -76,7 +76,7 @@ public: + void init(std::shared_ptr app) override; + void deinit() override; + +- HeadInfo get_head_info(int screen_index) const override; ++ std::optional get_head_info(int screen_index) const override; + int get_head_count() const override; + + void terminate() override; +diff --git a/ui/app/toolkits/qt/IToolkitPrivate.hh b/ui/app/toolkits/qt/IToolkitPrivate.hh +index ac1d16974..06b5c03e5 100644 +--- a/ui/app/toolkits/qt/IToolkitPrivate.hh ++++ b/ui/app/toolkits/qt/IToolkitPrivate.hh +@@ -27,7 +27,7 @@ public: + + virtual auto get_desktop_image() -> QPixmap = 0; + +- // virtual HeadInfo get_head_info(int screen_index) const = 0; ++ // virtual std::optional get_head_info(int screen_index) const = 0; + // virtual void attach_menu(Gtk::Menu *menu) = 0; + }; + diff --git a/sources b/sources index 6928137..987db4e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (workrave-v1_11_0_beta_13.tar.gz) = b0f24572d41d072d5fcc383ef2c01408a3f5329f2c48432041b19705eeb637f7eee030b4b659741a1dbcbc676430740cde64f7f0647aa9de77e8732c3157c3e1 +SHA512 (workrave-v1_11_0_rc_1.tar.gz) = 6538996af3abbbccad3d5b10e88edd1665961d4c5ff393878d2bbc54b78e986676965ed625e1abbfeaf6b8745ef15794679f429f31d3ddce202e0f105c25cbc4 diff --git a/workrave.spec b/workrave.spec index 105702f..960c8e3 100644 --- a/workrave.spec +++ b/workrave.spec @@ -1,22 +1,29 @@ -%bcond gnome 1 -%bcond gnome40 1 -%bcond gnome45 %[0%{?fedora} || 0%{?rhel} >= 10] -%bcond gnome_flashback %{undefined flatpak} -%bcond mate %{undefined flatpak} -%bcond xfce %{undefined flatpak} +%bcond gnome 1 +%bcond gnome40 1 +%bcond gnome45 %[0%{?fedora} || 0%{?rhel} >= 10] +%bcond gnome_flashback %{undefined flatpak} +%bcond mate %{undefined flatpak} +%bcond xfce %{undefined flatpak} %global app_id org.workrave.Workrave Name: workrave -Version: 1.11.0~beta.13 +Version: 1.11.0~rc.1 Release: %autorelease Summary: Program that assists in the recovery and prevention of RSI # Based on older packages by Dag Wieers and Steve Ratcliffe -License: GPL-3.0-or-later AND LGPL-2.0-or-later +# The workrave is released under the GPL-3.0-or-later license. Other licenses: +# libs/config/include/config/IConfiguratorListener.hh: GPL-2.0-or-later +# ui/app/toolkits/gtkmm/platforms/unix/gtktrayicon.{c,h}: LGPL-2.1-or-later +# ui/app/toolkits/gtkmm/platforms/unix/protocols/wlr-layer-shell-unstable-v1.xml: HPND +License: GPL-3.0-or-later AND GPL-2.0-or-later AND LGPL-2.1-or-later AND HPND URL: https://workrave.org/ %global tag %(echo %{version} | sed -e 's/[\\.~]/_/g') Source: https://github.com/rcaelers/workrave/archive/v%{tag}/%{name}-v%{tag}.tar.gz - +# Fixes nullptr dereference +# https://github.com/rcaelers/workrave/issues/606 +Patch: https://github.com/rcaelers/workrave/commit/1be2073.patch + BuildRequires: cmake BuildRequires: desktop-file-utils BuildRequires: gettext @@ -63,7 +70,10 @@ BuildRequires: pkgconfig(libmatepanelapplet-4.0) >= 1.20.0 # Logging BuildRequires: cmake(fmt) BuildRequires: cmake(spdlog) +BuildRequires: fdupes + +Requires: %{name}-common = %{version}-%{release} Requires: dbus-common Requires: hicolor-icon-theme Recommends: (%{name}-cinnamon if cinnamon) @@ -73,7 +83,6 @@ Recommends: (%{name}-mate if mate-panel) Recommends: (%{name}-xfce if xfce4-panel) Recommends: gstreamer1-plugins-base Recommends: gstreamer1-plugins-good -Obsoletes: %{name}-devel < %{version}-%{release} # https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval ExcludeArch: %{ix86} @@ -85,8 +94,17 @@ take micro-pauses, rest breaks and restricts you to your daily limit. %description %{_description} +%package common +Summary: Common data (sounds, icons, etc.) for Workrave +BuildArch: noarch + +%description common +%{_description} + +# cannot be marked noarch because it depends on the arched main package %package cinnamon -Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: cinnamon +Requires: %{name} = %{version}-%{release} Summary: Workrave applet for Cinnamon desktop %description cinnamon @@ -95,6 +113,7 @@ Summary: Workrave applet for Cinnamon desktop This package provides an applet for the Cinnamon desktop. %package gnome +Requires: gnome-shell Requires: %{name}%{?_isa} = %{version}-%{release} Summary: Workrave applet for GNOME desktop @@ -104,6 +123,7 @@ Summary: Workrave applet for GNOME desktop This package provides an applet for the GNOME desktop. %package gnome-flashback +Requires: gnome-panel Requires: %{name}%{?_isa} = %{version}-%{release} Summary: Workrave applet for GNOME Flashback @@ -113,6 +133,8 @@ Summary: Workrave applet for GNOME Flashback This package provides an applet for the GNOME Flashback panel. %package mate +Requires: mate-panel +Requires: mate-applets Requires: %{name}%{?_isa} = %{version}-%{release} Summary: Workrave applet for MATE @@ -122,6 +144,7 @@ Summary: Workrave applet for MATE This package provides an applet for the MATE panel. %package xfce +Requires: xfce4-panel Requires: %{name}%{?_isa} = %{version}-%{release} Summary: Workrave applet for Xfce @@ -139,6 +162,8 @@ This package provides an applet for the Xfce panel. %build +# without CMAKE_INSTALL_SYSCONFDIR set to /etc the autostart file +# gets installed in /usr/etc %cmake \ -DWITH_GNOME_CLASSIC_PANEL:BOOL=%{?with_gnome_flashback:ON}%{!?with_gnome_flashback:OFF} \ -DWITH_GNOME45:BOOL=%{?with_gnome45:ON}%{!?with_gnome45:OFF} \ @@ -151,6 +176,7 @@ This package provides an applet for the Xfce panel. -DWITH_INDICATOR:BOOL=ON \ -DWITH_APPINDICATOR:BOOL=ON \ -DWITH_WAYLAND:BOOL=ON \ + -DCMAKE_INSTALL_SYSCONFDIR:PATH=%{_sysconfdir} \ %{nil} %cmake_build @@ -168,31 +194,41 @@ rm -f %{buildroot}%{_libdir}/*indicators3/7/libworkrave.so* # fix appstream ID appstream-util modify %{buildroot}%{_metainfodir}/%{app_id}.metainfo.xml id %{app_id} -%find_lang %{name} +# remove zero-length to silence rpmlint +rm -f %{buildroot}%{_datadir}/gnome-shell/extensions/workrave@workrave.org/stylesheet.css +%find_lang %{name} +# avoid cross-directory-hard-link +ln -sf %{_datadir}/workrave/images/workrave-icon-medium.png %{buildroot}%{_datadir}/icons/hicolor/24x24/apps/workrave.png +%fdupes %{buildroot}%{_datadir} %check desktop-file-validate %{buildroot}%{_datadir}/applications/%{app_id}.desktop +desktop-file-validate %{buildroot}%{_sysconfdir}/xdg/autostart/%{app_id}.desktop appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{app_id}.metainfo.xml %files -f %{name}.lang -%doc AUTHORS COPYING NEWS README.md +%doc AUTHORS NEWS README.md +%license COPYING %{_bindir}/%{name} -%{_datadir}/applications/%{app_id}.desktop -%{_datadir}/dbus-1/services/%{app_id}.service -%{_datadir}/glib-2.0/schemas/org.workrave.*.xml -%{_datadir}/icons/hicolor/*/apps/%{name}.* -%{_datadir}/sounds/%{name}/ -%{_datadir}/%{name}/ -%{_metainfodir}/%{app_id}.metainfo.xml # support library for gtk3 applets %{_libdir}/girepository-1.0/Workrave-1.0.typelib %{_libdir}/libworkrave-private-1.0.so.* +%files common +%license COPYING +%{_datadir}/applications/%{app_id}.desktop +%{_datadir}/dbus-1/services/%{app_id}.service +%{_datadir}/glib-2.0/schemas/org.workrave.*.xml +%{_datadir}/icons/hicolor/*/apps/%{name}.* +%{_datadir}/%{name}/ +%{_datadir}/sounds/%{name}/ +# it isn't a conf file, so non-conffile-in-etc from rpmlint is a false positive here +%{_sysconfdir}/xdg/autostart/%{app_id}.desktop +%{_metainfodir}/%{app_id}.metainfo.xml + %files cinnamon -%dir %{_datadir}/cinnamon/ -%dir %{_datadir}/cinnamon/applets/ %{_datadir}/cinnamon/applets/workrave@workrave.org/ %if %{with gnome} @@ -201,8 +237,6 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{app_id}.meta %{_libdir}/girepository-1.0/Workrave-2.0.typelib %{_libdir}/libworkrave-gtk4-private-1.0.so.* %endif -%dir %{_datadir}/gnome-shell/ -%dir %{_datadir}/gnome-shell/extensions/ %{_datadir}/gnome-shell/extensions/workrave@workrave.org/ %endif @@ -222,7 +256,7 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{app_id}.meta %{_libdir}/mate-applets/workrave-applet %{_datadir}/dbus-1/services/org.mate.panel.applet.WorkraveAppletFactory.service %{_datadir}/mate-panel/applets/org.workrave.WorkraveApplet.mate-panel-applet -%{_datadir}/mate-panel/ui/workrave-menu.xml +%{_datadir}/mate-panel/ui %endif %changelog From 00a4cd357c6d898eb30b2ab40f079409d2e4727b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 20:32:07 +0000 Subject: [PATCH 80/90] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 08c452a451f462e9e9604c4416c4a06d9d38a469 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Wojni=C5=82owicz?= Date: Thu, 4 Sep 2025 21:19:06 +0200 Subject: [PATCH 81/90] Fix building on epel10 --- workrave.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/workrave.spec b/workrave.spec index 960c8e3..ffbc4c5 100644 --- a/workrave.spec +++ b/workrave.spec @@ -1,9 +1,10 @@ %bcond gnome 1 %bcond gnome40 1 %bcond gnome45 %[0%{?fedora} || 0%{?rhel} >= 10] -%bcond gnome_flashback %{undefined flatpak} -%bcond mate %{undefined flatpak} -%bcond xfce %{undefined flatpak} +# Disabled due to missing dependencies. +%bcond gnome_flashback %[0%{?fedora} || 0%{?rhel} <= 9] +%bcond mate %[0%{?fedora} || 0%{?rhel} <= 9] +%bcond xfce %[0%{?fedora} || 0%{?rhel} <= 9] %global app_id org.workrave.Workrave From ddd247b16c92b362228c3d9d3f789928113ce55f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Wojni=C5=82owicz?= Date: Wed, 10 Sep 2025 19:37:06 +0200 Subject: [PATCH 82/90] Fix cinnamon on epel10 --- workrave.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/workrave.spec b/workrave.spec index ffbc4c5..94c9e16 100644 --- a/workrave.spec +++ b/workrave.spec @@ -2,6 +2,7 @@ %bcond gnome40 1 %bcond gnome45 %[0%{?fedora} || 0%{?rhel} >= 10] # Disabled due to missing dependencies. +%bcond cinnamon %[0%{?fedora} || 0%{?rhel} <= 9] %bcond gnome_flashback %[0%{?fedora} || 0%{?rhel} <= 9] %bcond mate %[0%{?fedora} || 0%{?rhel} <= 9] %bcond xfce %[0%{?fedora} || 0%{?rhel} <= 9] @@ -229,8 +230,10 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{app_id}.meta %{_sysconfdir}/xdg/autostart/%{app_id}.desktop %{_metainfodir}/%{app_id}.metainfo.xml +%if %{with cinnamon} %files cinnamon %{_datadir}/cinnamon/applets/workrave@workrave.org/ +%endif %if %{with gnome} %files gnome From 1ff9d0bc37344b180eb203d7ad8209501cd0b555 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Wojni=C5=82owicz?= Date: Wed, 10 Sep 2025 19:47:44 +0200 Subject: [PATCH 83/90] Fix gnome on epel10 --- workrave.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/workrave.spec b/workrave.spec index 94c9e16..b8b592f 100644 --- a/workrave.spec +++ b/workrave.spec @@ -1,6 +1,6 @@ -%bcond gnome 1 -%bcond gnome40 1 -%bcond gnome45 %[0%{?fedora} || 0%{?rhel} >= 10] +%bcond gnome %[0%{?fedora} || 0%{?rhel} <= 9] +%bcond gnome40 %[0%{?fedora} || 0%{?rhel} <= 9] +%bcond gnome45 %[0%{?fedora} || 0%{?rhel} <= 9] # Disabled due to missing dependencies. %bcond cinnamon %[0%{?fedora} || 0%{?rhel} <= 9] %bcond gnome_flashback %[0%{?fedora} || 0%{?rhel} <= 9] From 785bbe69b6f74c61d9dbf41e8edb3f3ccfd62ea0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Wojni=C5=82owicz?= Date: Wed, 10 Sep 2025 20:36:01 +0200 Subject: [PATCH 84/90] Fix installed but unpackaged files found --- workrave.spec | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/workrave.spec b/workrave.spec index b8b592f..d2356c7 100644 --- a/workrave.spec +++ b/workrave.spec @@ -204,6 +204,16 @@ rm -f %{buildroot}%{_datadir}/gnome-shell/extensions/workrave@workrave.org/style ln -sf %{_datadir}/workrave/images/workrave-icon-medium.png %{buildroot}%{_datadir}/icons/hicolor/24x24/apps/workrave.png %fdupes %{buildroot}%{_datadir} +%if %{without cinnamon} +# avoid Installed (but unpackaged) file(s) found: +rm -rf %{buildroot}%{_datadir}/cinnamon +%endif + +%if %{without gnome} +# avoid Installed (but unpackaged) file(s) found: +rm -rf %{buildroot}%{_datadir}/gnome-shell +%endif + %check desktop-file-validate %{buildroot}%{_datadir}/applications/%{app_id}.desktop desktop-file-validate %{buildroot}%{_sysconfdir}/xdg/autostart/%{app_id}.desktop @@ -233,6 +243,7 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{app_id}.meta %if %{with cinnamon} %files cinnamon %{_datadir}/cinnamon/applets/workrave@workrave.org/ +%else %endif %if %{with gnome} From f5357bdf6e0c185101df0050a961eb84fbb686a4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 20:21:33 +0000 Subject: [PATCH 85/90] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From 9cdf0619edbe41eedd6e1ea73ee55edabe7b1810 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Wojni=C5=82owicz?= Date: Sun, 8 Mar 2026 09:18:02 +0100 Subject: [PATCH 86/90] Update to 1.11.0~rc.3 --- .gitignore | 1 + 1be2073.patch | 206 -------------------------------------------------- sources | 2 +- workrave.spec | 5 +- 4 files changed, 3 insertions(+), 211 deletions(-) delete mode 100644 1be2073.patch diff --git a/.gitignore b/.gitignore index e316004..9aa4244 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ workrave-1.9.1.tar.gz /workrave-v1_11_0_beta_12.tar.gz /workrave-v1_11_0_beta_13.tar.gz /workrave-v1_11_0_rc_1.tar.gz +/workrave-v1_11_0_rc_3.tar.gz diff --git a/1be2073.patch b/1be2073.patch deleted file mode 100644 index 692f402..0000000 --- a/1be2073.patch +++ /dev/null @@ -1,206 +0,0 @@ -From 1be2073a41691ff4db909b1b04de465c3e2c92dc Mon Sep 17 00:00:00 2001 -From: Rob Caelers -Date: Sat, 22 Mar 2025 17:57:22 +0100 -Subject: [PATCH] Make muilti-monitor support most robust (#606) - ---- - ui/app/Application.cc | 16 ++++++++++--- - ui/app/toolkits/gtkmm/IToolkitPrivate.hh | 3 ++- - ui/app/toolkits/gtkmm/MainWindow.cc | 14 ++++++++++-- - ui/app/toolkits/gtkmm/Toolkit.cc | 29 +++++++++++++++++++++--- - ui/app/toolkits/gtkmm/Toolkit.hh | 2 +- - ui/app/toolkits/qt/IToolkitPrivate.hh | 2 +- - 6 files changed, 55 insertions(+), 11 deletions(-) - -diff --git a/ui/app/Application.cc b/ui/app/Application.cc -index a88e6e49f..f3f7751b0 100644 ---- a/ui/app/Application.cc -+++ b/ui/app/Application.cc -@@ -152,6 +152,7 @@ Application::init_configurator() - { - if (std::filesystem::is_regular_file(ini_file)) - { -+ spdlog::info("Using INI configuration file: {}", ini_file); - configurator = workrave::config::ConfiguratorFactory::create(workrave::config::ConfigFileFormat::Ini); - configurator->load(ini_file); - } -@@ -174,6 +175,7 @@ Application::init_configurator() - #endif - if (!configFile.empty()) - { -+ spdlog::info("Using XML configuration file: {}", configFile); - configurator->load(configFile); - } - } -@@ -186,6 +188,7 @@ Application::init_configurator() - - if (configurator) - { -+ spdlog::info("Using INI configuration file: {}", ini_file); - configurator->load(ini_file); - configurator->save(); - } -@@ -432,7 +435,11 @@ Application::create_prelude_window(BreakId break_id) - - for (int i = 0; i < toolkit->get_head_count(); i++) - { -- prelude_windows.push_back(toolkit->create_prelude_window(i, break_id)); -+ auto prelude_window = toolkit->create_prelude_window(i, break_id); -+ if (prelude_window) -+ { -+ prelude_windows.push_back(prelude_window); -+ } - } - } - -@@ -479,8 +486,11 @@ Application::create_break_window(BreakId break_id, workrave::utils::Flagscreate_break_window(i, break_id, break_flags); - -- break_windows.push_back(break_window); -- break_window->init(); -+ if (break_window) -+ { -+ break_windows.push_back(break_window); -+ break_window->init(); -+ } - } - } - -diff --git a/ui/app/toolkits/gtkmm/IToolkitPrivate.hh b/ui/app/toolkits/gtkmm/IToolkitPrivate.hh -index abe3e5dbd..15f966514 100644 ---- a/ui/app/toolkits/gtkmm/IToolkitPrivate.hh -+++ b/ui/app/toolkits/gtkmm/IToolkitPrivate.hh -@@ -19,6 +19,7 @@ - #define ITOOLKIT_PRIVATE_HH - - #include -+#include - - #include "HeadInfo.hh" - -@@ -27,7 +28,7 @@ class IToolkitPrivate - public: - virtual ~IToolkitPrivate() = default; - -- virtual HeadInfo get_head_info(int screen_index) const = 0; -+ virtual std::optional get_head_info(int screen_index) const = 0; - virtual void attach_menu(Gtk::Menu *menu) = 0; - }; - -diff --git a/ui/app/toolkits/gtkmm/MainWindow.cc b/ui/app/toolkits/gtkmm/MainWindow.cc -index 74af375b9..96a176664 100644 ---- a/ui/app/toolkits/gtkmm/MainWindow.cc -+++ b/ui/app/toolkits/gtkmm/MainWindow.cc -@@ -351,7 +351,12 @@ MainWindow::convert_display_to_monitor(int &x, int &y) - - for (int i = 0; i < app->get_toolkit()->get_head_count(); i++) - { -- HeadInfo head = toolkit_priv->get_head_info(i); -+ auto optional_head = toolkit_priv->get_head_info(i); -+ if (!optional_head) -+ { -+ continue; -+ } -+ HeadInfo head = *optional_head; - - int left = head.get_x(); - int top = head.get_y(); -@@ -383,7 +388,12 @@ void - MainWindow::convert_monitor_to_display(int &x, int &y, int head) - { - auto toolkit_priv = std::dynamic_pointer_cast(app->get_toolkit()); -- HeadInfo h = toolkit_priv->get_head_info(head); -+ auto optional_head = toolkit_priv->get_head_info(head); -+ if (!optional_head) -+ { -+ return; -+ } -+ HeadInfo h = *optional_head; - - if (x < 0) - { -diff --git a/ui/app/toolkits/gtkmm/Toolkit.cc b/ui/app/toolkits/gtkmm/Toolkit.cc -index 76c456780..8fccf86b6 100644 ---- a/ui/app/toolkits/gtkmm/Toolkit.cc -+++ b/ui/app/toolkits/gtkmm/Toolkit.cc -@@ -145,11 +145,22 @@ Toolkit::run() - gapp->run(); - } - --HeadInfo -+std::optional - Toolkit::get_head_info(int screen_index) const - { - Glib::RefPtr display = Gdk::Display::get_default(); -+ if (!display) -+ { -+ logger->error("Failed to get default display"); -+ return {}; -+ } -+ - Glib::RefPtr monitor = display->get_monitor(screen_index); -+ if (!monitor) -+ { -+ logger->error("Failed to get monitor for screen index {}", screen_index); -+ return {}; -+ } - - HeadInfo head; - head.primary = monitor->is_primary(); -@@ -178,7 +189,13 @@ Toolkit::create_break_window(int screen_index, BreakId break_id, BreakFlags brea - { - IBreakWindow::Ptr ret; - -- HeadInfo head = get_head_info(screen_index); -+ auto optional_head = get_head_info(screen_index); -+ if (!optional_head) -+ { -+ logger->error("Failed to retrieve monitor info for screen index {}", screen_index); -+ return nullptr; -+ } -+ HeadInfo head = *optional_head; - - BlockMode block_mode = GUIConfig::block_mode()(); - -@@ -201,7 +218,13 @@ Toolkit::create_break_window(int screen_index, BreakId break_id, BreakFlags brea - IPreludeWindow::Ptr - Toolkit::create_prelude_window(int screen_index, workrave::BreakId break_id) - { -- HeadInfo head = get_head_info(screen_index); -+ auto optional_head = get_head_info(screen_index); -+ if (!optional_head) -+ { -+ logger->error("Failed to retrieve monitor info for screen index {}", screen_index); -+ return nullptr; -+ } -+ HeadInfo head = *optional_head; - return std::make_shared(head, break_id); - } - -diff --git a/ui/app/toolkits/gtkmm/Toolkit.hh b/ui/app/toolkits/gtkmm/Toolkit.hh -index 159a7815d..d337cd563 100644 ---- a/ui/app/toolkits/gtkmm/Toolkit.hh -+++ b/ui/app/toolkits/gtkmm/Toolkit.hh -@@ -76,7 +76,7 @@ public: - void init(std::shared_ptr app) override; - void deinit() override; - -- HeadInfo get_head_info(int screen_index) const override; -+ std::optional get_head_info(int screen_index) const override; - int get_head_count() const override; - - void terminate() override; -diff --git a/ui/app/toolkits/qt/IToolkitPrivate.hh b/ui/app/toolkits/qt/IToolkitPrivate.hh -index ac1d16974..06b5c03e5 100644 ---- a/ui/app/toolkits/qt/IToolkitPrivate.hh -+++ b/ui/app/toolkits/qt/IToolkitPrivate.hh -@@ -27,7 +27,7 @@ public: - - virtual auto get_desktop_image() -> QPixmap = 0; - -- // virtual HeadInfo get_head_info(int screen_index) const = 0; -+ // virtual std::optional get_head_info(int screen_index) const = 0; - // virtual void attach_menu(Gtk::Menu *menu) = 0; - }; - diff --git a/sources b/sources index 987db4e..bdd32ec 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (workrave-v1_11_0_rc_1.tar.gz) = 6538996af3abbbccad3d5b10e88edd1665961d4c5ff393878d2bbc54b78e986676965ed625e1abbfeaf6b8745ef15794679f429f31d3ddce202e0f105c25cbc4 +SHA512 (workrave-v1_11_0_rc_3.tar.gz) = 7dc2aa7a70c53156262d677a88e9ead634bd67d32475e7aa3f47f2eb7e943aa114ac574b3e621705c4a91051437d089c1cd61bec911e36842856bfe9fc173b16 diff --git a/workrave.spec b/workrave.spec index d2356c7..4448853 100644 --- a/workrave.spec +++ b/workrave.spec @@ -10,7 +10,7 @@ %global app_id org.workrave.Workrave Name: workrave -Version: 1.11.0~rc.1 +Version: 1.11.0~rc.3 Release: %autorelease Summary: Program that assists in the recovery and prevention of RSI # Based on older packages by Dag Wieers and Steve Ratcliffe @@ -22,9 +22,6 @@ License: GPL-3.0-or-later AND GPL-2.0-or-later AND LGPL-2.1-or-later AND H URL: https://workrave.org/ %global tag %(echo %{version} | sed -e 's/[\\.~]/_/g') Source: https://github.com/rcaelers/workrave/archive/v%{tag}/%{name}-v%{tag}.tar.gz -# Fixes nullptr dereference -# https://github.com/rcaelers/workrave/issues/606 -Patch: https://github.com/rcaelers/workrave/commit/1be2073.patch BuildRequires: cmake BuildRequires: desktop-file-utils From 1cb3c765dca5d7bab94ef1f1b50a90af3dce334a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Wojni=C5=82owicz?= Date: Sun, 8 Mar 2026 09:18:02 +0100 Subject: [PATCH 87/90] Update to 1.11.0~rc.4 --- .gitignore | 1 + sources | 2 +- workrave.spec | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 9aa4244..ae82c0c 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ workrave-1.9.1.tar.gz /workrave-v1_11_0_beta_13.tar.gz /workrave-v1_11_0_rc_1.tar.gz /workrave-v1_11_0_rc_3.tar.gz +/workrave-v1_11_0_rc_4.tar.gz diff --git a/sources b/sources index bdd32ec..c2f7abc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (workrave-v1_11_0_rc_3.tar.gz) = 7dc2aa7a70c53156262d677a88e9ead634bd67d32475e7aa3f47f2eb7e943aa114ac574b3e621705c4a91051437d089c1cd61bec911e36842856bfe9fc173b16 +SHA512 (workrave-v1_11_0_rc_4.tar.gz) = 82eb12f5d4edeeec763ce253dc9bf07b3a070b7c169f1bddd498587f967cc37cfcbb53854f826c57b88bf9ea499efed05c64929026ec40bc368b58d74378200a diff --git a/workrave.spec b/workrave.spec index 4448853..94891ae 100644 --- a/workrave.spec +++ b/workrave.spec @@ -10,7 +10,7 @@ %global app_id org.workrave.Workrave Name: workrave -Version: 1.11.0~rc.3 +Version: 1.11.0~rc.4 Release: %autorelease Summary: Program that assists in the recovery and prevention of RSI # Based on older packages by Dag Wieers and Steve Ratcliffe From 5c7d0e50b8985f154755a8c80341fcf8ef0a5f6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= Date: Thu, 25 Jun 2026 12:41:59 +0200 Subject: [PATCH 88/90] Rebuilt for fmt/spdlog From ec7048935edae29c84f000a8e872bbb85ba8ec54 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 08:55:19 +0000 Subject: [PATCH 89/90] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild From d22b73ddeab4f2fd5ab16859028dd675d76b67ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Wojni=C5=82owicz?= Date: Sat, 25 Jul 2026 21:14:48 +0200 Subject: [PATCH 90/90] Update to 1.11.1 --- .gitignore | 1 + 710.patch | 22 ++++++++++++++++++++++ sources | 2 +- workrave.spec | 8 +++----- 4 files changed, 27 insertions(+), 6 deletions(-) create mode 100644 710.patch diff --git a/.gitignore b/.gitignore index ae82c0c..99ee0ca 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ workrave-1.9.1.tar.gz /workrave-v1_11_0_rc_1.tar.gz /workrave-v1_11_0_rc_3.tar.gz /workrave-v1_11_0_rc_4.tar.gz +/workrave-v1_11_1.tar.gz diff --git a/710.patch b/710.patch new file mode 100644 index 0000000..a31c450 --- /dev/null +++ b/710.patch @@ -0,0 +1,22 @@ +From 7bcdae9a7d5b2dd11decdb3adf23736622b5aab8 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?=C5=81ukasz=20Wojni=C5=82owicz?= + +Date: Sat, 25 Jul 2026 20:51:49 +0200 +Subject: [PATCH] Fix appstream id case + +--- + ui/app/workrave.metainfo.xml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ui/app/workrave.metainfo.xml b/ui/app/workrave.metainfo.xml +index 794541993..866aaa332 100644 +--- a/ui/app/workrave.metainfo.xml ++++ b/ui/app/workrave.metainfo.xml +@@ -1,6 +1,6 @@ + + +- org.workrave.workrave ++ org.workrave.Workrave + Workrave + Workrave assists in the recovery and prevention of Repetitive Strain Injury (RSI) + CC-BY-3.0 diff --git a/sources b/sources index c2f7abc..12d954c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (workrave-v1_11_0_rc_4.tar.gz) = 82eb12f5d4edeeec763ce253dc9bf07b3a070b7c169f1bddd498587f967cc37cfcbb53854f826c57b88bf9ea499efed05c64929026ec40bc368b58d74378200a +SHA512 (workrave-v1_11_1.tar.gz) = 45b7e7f84cd5d29945006da524676486c1b87627f6d1ff6e9106e9dd0f4034c26052f23649f312cc1513b17470197b4acea4974744d2a8e1093b31523290f82f diff --git a/workrave.spec b/workrave.spec index 94891ae..22b21ad 100644 --- a/workrave.spec +++ b/workrave.spec @@ -10,7 +10,7 @@ %global app_id org.workrave.Workrave Name: workrave -Version: 1.11.0~rc.4 +Version: 1.11.1 Release: %autorelease Summary: Program that assists in the recovery and prevention of RSI # Based on older packages by Dag Wieers and Steve Ratcliffe @@ -22,7 +22,8 @@ License: GPL-3.0-or-later AND GPL-2.0-or-later AND LGPL-2.1-or-later AND H URL: https://workrave.org/ %global tag %(echo %{version} | sed -e 's/[\\.~]/_/g') Source: https://github.com/rcaelers/workrave/archive/v%{tag}/%{name}-v%{tag}.tar.gz - +Patch: https://github.com/rcaelers/workrave/pull/710.patch + BuildRequires: cmake BuildRequires: desktop-file-utils BuildRequires: gettext @@ -190,9 +191,6 @@ rm -f %{buildroot}%{_libdir}/*.so # indicators need to be enabled to build GIR but are not needed otherwise rm -f %{buildroot}%{_libdir}/*indicators3/7/libworkrave.so* -# fix appstream ID -appstream-util modify %{buildroot}%{_metainfodir}/%{app_id}.metainfo.xml id %{app_id} - # remove zero-length to silence rpmlint rm -f %{buildroot}%{_datadir}/gnome-shell/extensions/workrave@workrave.org/stylesheet.css