diff --git a/.gitignore b/.gitignore index a6dda69..54c7f90 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,5 @@ xfce4-cpugraph-plugin-0.4.0.tar.gz /xfce4-cpugraph-plugin-1.2.7.tar.bz2 /xfce4-cpugraph-plugin-1.2.8.tar.bz2 /xfce4-cpugraph-plugin-1.2.10.tar.bz2 +/xfce4-cpugraph-plugin-1.2.11.tar.bz2 +/xfce4-cpugraph-plugin-1.3.0.tar.xz diff --git a/sources b/sources index 81d39fe..8117c66 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xfce4-cpugraph-plugin-1.2.10.tar.bz2) = 414c2a5da9576d2ed1f5478a07ff5c51c45eaa0a8432a31b6fb2408b81f5ab4485e3b10486af26cf33a18d23e2dc3afe21bf88630e4db91adcfa3e0f80468cf3 +SHA512 (xfce4-cpugraph-plugin-1.3.0.tar.xz) = aefb0f94b7a4a480ca5769bd09aed29404316562a70abcb243c538de8637062de2eb6defe424d1f2cd2555a49d5aae4393b623b4d65dca84f87b420d38da4443 diff --git a/xfce4-cpugraph-plugin.spec b/xfce4-cpugraph-plugin.spec index dfc6f2e..1a8677e 100644 --- a/xfce4-cpugraph-plugin.spec +++ b/xfce4-cpugraph-plugin.spec @@ -1,25 +1,25 @@ # Review: https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=173658 %global _hardened_build 1 -%global minorversion 1.2 +%global minorversion 1.3 %global xfceversion 4.18 Name: xfce4-cpugraph-plugin -Version: 1.2.10 +Version: 1.3.0 Release: %autorelease Summary: CPU monitor for the Xfce panel -License: GPLv2+ +# 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} #VCS: git:git://git.xfce.org/panel-plugins/xfce4-cpugraph-plugin -Source0: http://archive.xfce.org/src/panel-plugins/%{name}/%{minorversion}/%{name}-%{version}.tar.bz2 +Source0: http://archive.xfce.org/src/panel-plugins/%{name}/%{minorversion}/%{name}-%{version}.tar.xz -BuildRequires: make +BuildRequires: make BuildRequires: gcc-c++ BuildRequires: libxfce4ui-devel BuildRequires: xfce4-panel-devel -BuildRequires: intltool -BuildRequires: gettext +BuildRequires: meson Requires: xfce4-panel >= %{xfceversion} %description @@ -33,27 +33,24 @@ colors and the size of the plugin are customizable. %build -%configure -%make_build +%meson +%meson_build %install -%make_install -# remove la file -find %{buildroot} -name '*.la' -exec rm -f {} ';' +%meson_install # make sure debuginfo is generated properly chmod -c +x %{buildroot}%{_libdir}/xfce4/panel/plugins/*.so %find_lang %{name} - %check -make check +%meson_test %files -f %{name}.lang -%doc AUTHORS ChangeLog NEWS +%doc AUTHORS NEWS %license COPYING %{_libdir}/xfce4/panel/plugins/*.so %{_datadir}/xfce4/panel/plugins/*.desktop