diff --git a/.gitignore b/.gitignore index 99ee0ca..3f69983 100644 --- a/.gitignore +++ b/.gitignore @@ -14,11 +14,3 @@ 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 -/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 -/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/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/710.patch b/710.patch deleted file mode 100644 index a31c450..0000000 --- a/710.patch +++ /dev/null @@ -1,22 +0,0 @@ -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/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/sources b/sources index 12d954c..45d2d7f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (workrave-v1_11_1.tar.gz) = 45b7e7f84cd5d29945006da524676486c1b87627f6d1ff6e9106e9dd0f4034c26052f23649f312cc1513b17470197b4acea4974744d2a8e1093b31523290f82f +SHA512 (workrave-v1_10_50.tar.gz) = ccc985518aab06e31447ac9a16f4a39dfae077be581706b4ac88392e4d5e993f32b2bdc5697d7540785d5ebd6f1d31339d5dc1a5f7b6241da44a4e61cce021da diff --git a/workrave.spec b/workrave.spec index 22b21ad..d02f21f 100644 --- a/workrave.spec +++ b/workrave.spec @@ -1,273 +1,431 @@ -%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] -%bcond mate %[0%{?fedora} || 0%{?rhel} <= 9] -%bcond xfce %[0%{?fedora} || 0%{?rhel} <= 9] +%global gnome_flashback 1 +%global mate 1 +%global xfce 1 -%global app_id org.workrave.Workrave - -Name: workrave -Version: 1.11.1 -Release: %autorelease -Summary: Program that assists in the recovery and prevention of RSI +Name: workrave +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 -# 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 -Patch: https://github.com/rcaelers/workrave/pull/710.patch +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 -BuildRequires: cmake -BuildRequires: desktop-file-utils -BuildRequires: gettext +Obsoletes: %{name}-gtk2 < 1.10.37-1 +Provides: %{name}-gtk2 = %{?epoch:%{epoch}:}%{version}-%{release} + +BuildRequires: make 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: libX11-devel +BuildRequires: libXScrnSaver-devel +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.22.0 -# Sound support +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 +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 -# 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: gettext +BuildRequires: intltool +BuildRequires: autoconf, automake, libtool, autoconf-archive +BuildRequires: desktop-file-utils +%if 0%{?gnome_flashback} BuildRequires: pkgconfig(libgnome-panel) %endif -%if %{with gnome40} -BuildRequires: pkgconfig(gtk4) +%if 0%{?xfce} || 0%{?mate} +BuildRequires: pkgconfig(gtk+-3.0) %endif -%if %{with xfce} +%if 0%{?xfce} BuildRequires: pkgconfig(libxfce4panel-2.0) >= 4.12 %endif -%if %{with mate} -BuildRequires: pkgconfig(libmatepanelapplet-4.0) >= 1.20.0 +%if 0%{?mate} +BuildRequires: pkgconfig(libmatepanelapplet-4.0) %endif -# 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) -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 - -# 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. +Requires: dbus +%if 0%{?fedora} +Recommends: gstreamer1-plugins-base +Recommends: gstreamer1-plugins-good +%endif +Obsoletes: %{name}-devel < %{version}-%{release} %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: 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: gnome-shell -Requires: %{name}%{?_isa} = %{version}-%{release} -Summary: Workrave applet for GNOME desktop - -%description gnome -%{_description} - -This package provides an applet for the GNOME desktop. +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 gnome-flashback -Requires: gnome-panel -Requires: %{name}%{?_isa} = %{version}-%{release} -Summary: Workrave applet for 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. %package mate -Requires: mate-panel -Requires: mate-applets -Requires: %{name}%{?_isa} = %{version}-%{release} -Summary: Workrave applet for MATE +Requires: %{name} = %{version}-%{release} +Summary: Workrave applet for MATE %description mate -%{_description} +%{description} This package provides an applet for the MATE panel. %package xfce -Requires: xfce4-panel -Requires: %{name}%{?_isa} = %{version}-%{release} -Summary: Workrave applet for Xfce +Requires: %{name} = %{version}-%{release} +Summary: Workrave applet for Xfce %description xfce -%{_description} +%{description} This package provides an applet for the Xfce panel. %prep -%autosetup -n workrave-%{tag} -p1 +%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.* -# use versioned python command -%py3_shebang_fix libs/dbus/bin/dbusgen.py +# upstream is python2 +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 -# 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} \ - -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 \ - -DCMAKE_INSTALL_SYSCONFDIR:PATH=%{_sysconfdir} \ - %{nil} +if [ ! -x configure ]; then + ### Needed for snapshot releases. + NOCONFIGURE=1 ./autogen.sh +fi -%cmake_build +# 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 %{_smp_mflags} %install -%cmake_install +make install DESTDIR=%{buildroot} +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* - -# 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} -%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 -appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{app_id}.metainfo.xml +desktop-file-install \ + --dir %{buildroot}%{_datadir}/applications \ + --delete-original \ + %{buildroot}%{_datadir}/applications/%{name}.desktop %files -f %{name}.lang -%doc AUTHORS NEWS README.md -%license COPYING -%{_bindir}/%{name} +%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 +%{_datadir}/glib-2.0/schemas/org.workrave.*.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 - -%if %{with cinnamon} -%files cinnamon -%{_datadir}/cinnamon/applets/workrave@workrave.org/ -%else -%endif - -%if %{with gnome} -%files gnome -%if %{with gnome40} -%{_libdir}/girepository-1.0/Workrave-2.0.typelib -%{_libdir}/libworkrave-gtk4-private-1.0.so.* -%endif +# gnome-shell extension +%dir %{_datadir}/gnome-shell/ +%dir %{_datadir}/gnome-shell/extensions/ %{_datadir}/gnome-shell/extensions/workrave@workrave.org/ -%endif +# 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 -%if %{with gnome_flashback} +%if 0%{?gnome_flashback} %files gnome-flashback %{_libdir}/gnome-panel/modules/libworkrave-applet.so %endif -%if %{with xfce} +%if 0%{?xfce} %files xfce %{_libdir}/xfce4/panel/plugins/libworkrave-plugin.so %{_datadir}/xfce4/panel/plugins/workrave-xfce-applet.desktop %endif -%if %{with mate} +%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 +%{_datadir}/mate-panel/ui/workrave-menu.xml %endif %changelog -%autochangelog +* 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