diff --git a/.gitignore b/.gitignore index efb7cec..ec03acd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,2 @@ -xfce4-timer-plugin-0.6.1.tar.bz2 -/xfce4-timer-plugin-1.6.0.tar.bz2 -/xfce4-timer-plugin-1.7.0.tar.bz2 -/xfce4-timer-plugin-1.7.1.tar.bz2 -/xfce4-timer-plugin-1.7.2.tar.bz2 +/xfce4-timer-plugin-*.tar.bz2 +/xfce4-timer-plugin-*.tar.xz diff --git a/sources b/sources index a4efa0a..eff79b2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xfce4-timer-plugin-1.7.2.tar.bz2) = 11a3b146c56f1526530b7f810c76ba95ef4dc7c113fa0ad2839494a5bc66c09f4a3ff966bc5d76055482a284c6c082b08a4b6af4684e5ccdec67946b0cdd820d +SHA512 (xfce4-timer-plugin-1.8.0.tar.xz) = 9729181248ee3aa6e90be8a6975a76121ce89c26131fc4eadb6840eec7059afb45f06ff9bae5e202e39d081bd898ece2fd236c5d64e1ab07a8c8ecb2c18558f0 diff --git a/xfce4-timer-plugin.spec b/xfce4-timer-plugin.spec index 51f271d..b7f264f 100644 --- a/xfce4-timer-plugin.spec +++ b/xfce4-timer-plugin.spec @@ -1,25 +1,22 @@ -%global minorver 1.7 -%global _hardened_build 1 +# CVS https://gitlab.xfce.org/panel-plugins/xfce4-timer-plugin +%global minorver 1.8 -Name: xfce4-timer-plugin -Version: 1.7.2 -Release: %autorelease -Summary: Timer for the Xfce panel -# Automatically converted from old format: GPLv2+ - review is highly recommended. -License: GPL-2.0-or-later -URL: http://goodies.xfce.org/projects/panel-plugins/%{name} -Source0: http://archive.xfce.org/src/panel-plugins/xfce4-timer-plugin/%{minorver}/%{name}-%{version}.tar.bz2 +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: make -BuildRequires: gcc-c++ -BuildRequires: xfce4-panel-devel -BuildRequires: libxfce4ui-devel -BuildRequires: libxml2-devel -BuildRequires: gettext -BuildRequires: intltool -BuildRequires: perl(XML::Parser) +BuildRequires: gcc-c++ +BuildRequires: gettext +BuildRequires: libxfce4ui-devel +BuildRequires: libxml2-devel +BuildRequires: meson +BuildRequires: xfce4-panel-devel -Requires: xfce4-panel +Requires: xfce4-panel %description A timer for the Xfce panel. It supports countdown periods and alarms at @@ -29,23 +26,30 @@ certain times. %prep %autosetup -%build -%configure --disable-static -%make_build +%build +%meson +%meson_build + %install -%make_install +%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} %files -f %{name}.lang -%doc AUTHORS ChangeLog TODO +%doc AUTHORS NEWS README.md %license COPYING -%{_libdir}/xfce4/panel/plugins/libxfcetimer* +%{_libdir}/xfce4/panel/plugins/libxfcetimer.so %{_datadir}/xfce4/panel/plugins/xfce4-timer-plugin.desktop %{_datadir}/icons/hicolor/*/apps/xfce4-timer-plugin.*g + %changelog %autochangelog