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

.cvsignore

@@ -1 +0,0 @@
-xfce4-timer-plugin-0.5.1.tar.bz2

.gitignore

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

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: xfce4-timer-plugin
-# $Id$
-NAME := xfce4-timer-plugin
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

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 @@
-0036d3805cbe051d35e8ec595237e88c  xfce4-timer-plugin-0.5.1.tar.bz2
+SHA512 (xfce4-timer-plugin-1.8.0.tar.xz) = 9729181248ee3aa6e90be8a6975a76121ce89c26131fc4eadb6840eec7059afb45f06ff9bae5e202e39d081bd898ece2fd236c5d64e1ab07a8c8ecb2c18558f0

xfce4-timer-plugin.spec

@@ -1,53 +1,55 @@
-Name:		xfce4-timer-plugin
+# CVS   https://gitlab.xfce.org/panel-plugins/xfce4-timer-plugin
-Version:	0.5.1
+%global minorver 1.8
-Release:	3%{?dist}
-Summary:	Timer for the Xfce panel
 
-Group:		User Interface/Desktops
+Name:           xfce4-timer-plugin
-License:	GPLv2+
+Version:        1.8.0
-URL:		http://goodies.xfce.org/projects/panel-plugins/%{name}
+Release:        %autorelease
-Source0:	http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.bz2
+Summary:        Timer for the Xfce panel
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+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:  gcc-c++
-BuildRequires:	libxml2-devel, gettext, perl(XML::Parser)
+BuildRequires:  gettext
-Requires:	xfce4-panel >= 4.4.0
+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 
 certain times.
 
+
 %prep
-%setup -q
+%autosetup
+
 
 %build
-%configure --disable-static
+%meson
-make %{?_smp_mflags}
+%meson_build
+
 
 %install
-rm -rf $RPM_BUILD_ROOT
+%meson_install
-make install DESTDIR=$RPM_BUILD_ROOT
+
+# 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 NEWS README.md
-%doc AUTHORS COPYING ChangeLog README TODO
+%license COPYING
-%{_libexecdir}/xfce4/panel-plugins/xfce4-timer
+%{_libdir}/xfce4/panel/plugins/libxfcetimer.so
-%{_datadir}/xfce4/panel-plugins/*.desktop
+%{_datadir}/xfce4/panel/plugins/xfce4-timer-plugin.desktop
+%{_datadir}/icons/hicolor/*/apps/xfce4-timer-plugin.*g
+
 
 %changelog
-* Sat Aug 25 2007 Christoph Wickert <fedora christoph-wickert de> - 0.5.1-3
+%autochangelog
-- Rebuild for BuildID feature
-- Update license tag
-
-* Sat Apr 28 2007 Christoph Wickert <fedora christoph-wickert de> - 0.5.1-2
-- Rebuild for Xfce 4.4.1
-
-* Sat Jan 27 2007 Christoph Wickert <fedora christoph-wickert de> - 0.5.1-1
-- Update to 0.5.1 on Xfce 4.4.
-
-* Sat Sep 23 2006 Christoph Wickert <fedora christoph-wickert de> - 0.5-1
-- Initial Fedora Extras version.