Update to 1.8.0 + switch to meson build system + spec cleanup and modernization

This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4

.gitignore

@@ -1 +1,2 @@
-xfce4-timer-plugin-0.6.1.tar.bz2
+/xfce4-timer-plugin-*.tar.bz2
+/xfce4-timer-plugin-*.tar.xz

changelog

@@ -0,0 +1,138 @@
+* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.1-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.1-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.1-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.1-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Thu Jan 28 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.1-3
+- Second attempt - Rebuilt for
+  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Thu Jul 23 2020 Mukundan Ragavan <nonamedotc@fedoraproject.org> - 1.7.1-1
+- Update to 1.7.1
+
+* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.0-23
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.0-22
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.0-21
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Sat Aug 11 2018 Mukundan Ragavan <nonamedotc@fedoraproject.org> - 1.7.0-20
+- Rebuilt (xfce 4.13)
+
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Sat Feb 10 2018 Filipe Rosset <rosset.filipe@gmail.com> - 1.7.0-1
+- Bump to 1.7.0, drop unneeded patches, spec cleanup
+
+* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.0-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.0-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.0-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.6.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Sun Mar 29 2015 Kevin Fenzi <kevin@scrye.com> 1.6.0-1
+- Update to 1.6.0 now using libxfce4ui
+
+* Sat Feb 28 2015 Kevin Fenzi <kevin@scrye.com> 0.6.1-17
+- Rebuild for Xfce 4.12
+
+* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.1-16
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.1-15
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.1-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.1-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.1-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Sun Apr 15 2012 Kevin Fenzi <kevin@scrye.com> - 0.6.1-11
+- Rebuild for Xfce 4.10(pre2)
+
+* Thu Apr 05 2012 Kevin Fenzi <kevin@scrye.com> - 0.6.1-10
+- Rebuild for Xfce 4.10
+
+* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.1-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Tue Dec 06 2011 Adam Jackson <ajax@redhat.com> - 0.6.1-8
+- Rebuild for new libpng
+
+* Sat Mar 05 2011 Christoph Wickert <cwickert@fedoraproject.org> - 0.6.1-7
+- Fix segfault when creating plugin in 4.8 panel (#682458)
+- Update translations from Xfce Transifex
+
+* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.1-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Thu Jan 13 2011 Kevin Fenzi <kevin@tummy.com> - 0.6.1-5
+- Rebuild for Xfce 4.8
+
+* Mon Jul 27 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sun Jan 18 2009 Christoph Wickert <cwickert@fedoraproject.org> - 0.6.1-2
+- Rebuild for Xfce 4.6 (Beta 3)
+
+* Thu Nov 27 2008 Christoph Wickert <cwickert@fedoraproject.org> - 0.6.1-1
+- Update to 0.6.1
+- BR intltool
+
+* Mon Feb 18 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 0.6-3
+- Autorebuild for GCC 4.3
+
+* Sat Dec 29 2007 Christoph Wickert <cwickert@fedoraproject.org> - 0.6-2
+- Bump release due to tag collision
+
+* Sat Dec 29 2007 Christoph Wickert <cwickert@fedoraproject.org> - 0.6-1
+- Update to 0.6
+
+* Sat Aug 25 2007 Christoph Wickert <cwickert@fedoraproject.org> - 0.5.1-3
+- Rebuild for BuildID feature
+- Update license tag
+
+* Sat Apr 28 2007 Christoph Wickert <cwickert@fedoraproject.org> - 0.5.1-2
+- Rebuild for Xfce 4.4.1
+
+* Sat Jan 27 2007 Christoph Wickert <cwickert@fedoraproject.org> - 0.5.1-1
+- Update to 0.5.1 on Xfce 4.4.
+
+* Sat Sep 23 2006 Christoph Wickert <cwickert@fedoraproject.org> - 0.5-1
+- Initial Fedora Extras version.

sources

@@ -1 +1 @@
-ba5ae0e25f69517338f74a27fbaf4ca2  xfce4-timer-plugin-0.6.1.tar.bz2
+SHA512 (xfce4-timer-plugin-1.8.0.tar.xz) = 9729181248ee3aa6e90be8a6975a76121ce89c26131fc4eadb6840eec7059afb45f06ff9bae5e202e39d081bd898ece2fd236c5d64e1ab07a8c8ecb2c18558f0

xfce4-timer-plugin-0.6.1-fix-segfault-when-creating-plugin-in-4.8-panel.patch

@@ -1,39 +0,0 @@
-From 03ff202f818fe3f075a6c864ab688b57b1bb1cb4 Mon Sep 17 00:00:00 2001
-From: Nick Schermer <nick@xfce.org>
-Date: Thu, 27 Jan 2011 21:18:45 +0000
-Subject: Fix segfault when creating plugin in 4.8 panel.
-
-Used invalid function type to construct the plugin.
----
-diff --git a/src/xfcetimer.c b/src/xfcetimer.c
-index c27d37a..de7bd2b 100644
---- a/src/xfcetimer.c
-+++ b/src/xfcetimer.c
-@@ -42,7 +42,7 @@
- 
- #include "xfcetimer.h"
- 
--static gboolean create_plugin_control (XfcePanelPlugin *plugin);
-+static void create_plugin_control (XfcePanelPlugin *plugin);
- XFCE_PANEL_PLUGIN_REGISTER_EXTERNAL(create_plugin_control);
- 
- void make_menu(plugin_data *pd);
-@@ -1366,7 +1366,7 @@ static void plugin_create_options (XfcePanelPlugin *plugin,plugin_data *pd) {
-  *
-  * Returns %TRUE on success, %FALSE on failure.
-  **/
--static gboolean
-+static void
- create_plugin_control (XfcePanelPlugin *plugin)
- {
- 
-@@ -1461,7 +1461,6 @@ create_plugin_control (XfcePanelPlugin *plugin)
-   xfce_panel_plugin_menu_show_configure (plugin);
-   g_signal_connect (plugin, "configure-plugin",
-                       G_CALLBACK (plugin_create_options), pd);
--  return(TRUE);
- }
- 
- 
---
-cgit v0.8.3.4

xfce4-timer-plugin.spec

@@ -1,24 +1,22 @@
-Name:		xfce4-timer-plugin
-Version:	0.6.1
-Release:	7%{?dist}
-Summary:	Timer for the Xfce panel
+# CVS   https://gitlab.xfce.org/panel-plugins/xfce4-timer-plugin
+%global minorver 1.8
 
-Group:		User Interface/Desktops
-License:	GPLv2+
-URL:		http://goodies.xfce.org/projects/panel-plugins/%{name}
-Source0:	http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.bz2
-# http://git.xfce.org/panel-plugins/xfce4-timer-plugin/commit/?id=03ff202f818fe3f075a6c864ab688b57b1bb1cb4
-# fixes https://bugzilla.redhat.com/show_bug.cgi?id=682458
-Patch0:         xfce4-timer-plugin-0.6.1-fix-segfault-when-creating-plugin-in-4.8-panel.patch
-# contains all translations from 
-# http://translations.xfce.org/projects/p/xfce4-timer-plugin/c/master/ 
-# as of 2011-03-05
-Patch1:         xfce4-timer-plugin-0.6.1-update-translations.patch
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Name:           xfce4-timer-plugin
+Version:        1.8.0
+Release:        %autorelease
+Summary:        Timer for the Xfce panel
+License:        GPL-2.0-or-later
+URL:            https://docs.xfce.org/panel-plugins/xfce4-timer-plugin/start
+Source0:        https://archive.xfce.org/src/panel-plugins/xfce4-timer-plugin/%{minorver}/%{name}-%{version}.tar.xz
 
-BuildRequires:	xfce4-panel-devel >= 4.3.20, libxfcegui4-devel >= 4.3.0
-BuildRequires:	libxml2-devel, gettext, intltool, perl(XML::Parser)
-Requires:	xfce4-panel >= 4.4.0
+BuildRequires:  gcc-c++
+BuildRequires:  gettext
+BuildRequires:  libxfce4ui-devel
+BuildRequires:  libxml2-devel
+BuildRequires:  meson
+BuildRequires:  xfce4-panel-devel
+
+Requires:       xfce4-panel
 
 %description
 A timer for the Xfce panel. It supports countdown periods and alarms at 
@@ -26,75 +24,32 @@ certain times.
 
 
 %prep
-%setup -q
-%patch0 -p1 -b .fix-segfault
-%patch1 -p1 -b .update-translations
+%autosetup
 
 
 %build
-%configure --disable-static
-make %{?_smp_mflags}
+%meson
+%meson_build
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+%meson_install
+
+# Rename non-standard hye locale to hy
+if [ -d %{buildroot}%{_datadir}/locale/hye ]; then
+    mv %{buildroot}%{_datadir}/locale/hye %{buildroot}%{_datadir}/locale/hy
+fi
+
 %find_lang %{name}
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %files -f %{name}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog README TODO
-%{_libexecdir}/xfce4/panel-plugins/xfce4-timer
-%{_datadir}/xfce4/panel-plugins/*.desktop
+%doc AUTHORS NEWS README.md
+%license COPYING
+%{_libdir}/xfce4/panel/plugins/libxfcetimer.so
+%{_datadir}/xfce4/panel/plugins/xfce4-timer-plugin.desktop
+%{_datadir}/icons/hicolor/*/apps/xfce4-timer-plugin.*g
 
 
 %changelog
-* Sat Mar 05 2011 Christoph Wickert <cwickert@fedoraproject.org> - 0.6.1-7
-- Fix segfault when creating plugin in 4.8 panel (#682458)
-- Update translations from Xfce Transifex
-
-* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.1-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Thu Jan 13 2011 Kevin Fenzi <kevin@tummy.com> - 0.6.1-5
-- Rebuild for Xfce 4.8
-
-* Mon Jul 27 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.1-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Thu Feb 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Sun Jan 18 2009 Christoph Wickert <cwickert@fedoraproject.org> - 0.6.1-2
-- Rebuild for Xfce 4.6 (Beta 3)
-
-* Thu Nov 27 2008 Christoph Wickert <cwickert@fedoraproject.org> - 0.6.1-1
-- Update to 0.6.1
-- BR intltool
-
-* Mon Feb 18 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 0.6-3
-- Autorebuild for GCC 4.3
-
-* Sat Dec 29 2007 Christoph Wickert <cwickert@fedoraproject.org> - 0.6-2
-- Bump release due to tag collision
-
-* Sat Dec 29 2007 Christoph Wickert <cwickert@fedoraproject.org> - 0.6-1
-- Update to 0.6
-
-* Sat Aug 25 2007 Christoph Wickert <cwickert@fedoraproject.org> - 0.5.1-3
-- Rebuild for BuildID feature
-- Update license tag
-
-* Sat Apr 28 2007 Christoph Wickert <cwickert@fedoraproject.org> - 0.5.1-2
-- Rebuild for Xfce 4.4.1
-
-* Sat Jan 27 2007 Christoph Wickert <cwickert@fedoraproject.org> - 0.5.1-1
-- Update to 0.5.1 on Xfce 4.4.
-
-* Sat Sep 23 2006 Christoph Wickert <cwickert@fedoraproject.org> - 0.5-1
-- Initial Fedora Extras version.
+%autochangelog