diff --git a/.gitignore b/.gitignore index d7faf27..9fd9b88 100644 --- a/.gitignore +++ b/.gitignore @@ -1,13 +1,2 @@ -xfce4-systemload-plugin-0.4.2.tar.bz2 -/xfce4-systemload-plugin-1.0.0.tar.bz2 -/xfce4-systemload-plugin-1.1.0.tar.bz2 -/xfce4-systemload-plugin-1.1.1.tar.bz2 -/xfce4-systemload-plugin-1.1.2.tar.bz2 -/xfce4-systemload-plugin-1.2.0.tar.bz2 -/xfce4-systemload-plugin-1.2.1.tar.bz2 -/xfce4-systemload-plugin-1.2.2.tar.bz2 -/xfce4-systemload-plugin-1.2.3.tar.bz2 -/xfce4-systemload-plugin-1.2.4.tar.bz2 -/xfce4-systemload-plugin-1.3.0.tar.bz2 -/xfce4-systemload-plugin-1.3.1.tar.bz2 -/xfce4-systemload-plugin-1.3.3.tar.bz2 +/xfce4-systemload-plugin-*.tar.bz2 +/xfce4-systemload-plugin-*.tar.xz diff --git a/sources b/sources index e5dd37d..897b246 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xfce4-systemload-plugin-1.3.3.tar.bz2) = 5dd74af41df01af1cf064effd33e13f26f530ffe0a043cce7b6519187393099a4da7e8c8e035c50796d1d19f09e38d2d75966e1e4fa5d1db8cb44d0e020a802c +SHA512 (xfce4-systemload-plugin-1.4.0.tar.xz) = ebb444eb91f032eb64f5b38e14d1a6e9e23ac0c38f41705d389e48878540663556435d26997de88a3116351bd72db8b02718cdd525961f8e35c62a3980438e68 diff --git a/xfce4-systemload-plugin.spec b/xfce4-systemload-plugin.spec index d4b68be..c96988e 100644 --- a/xfce4-systemload-plugin.spec +++ b/xfce4-systemload-plugin.spec @@ -1,32 +1,31 @@ # Review: https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=173668 +# VCS https://gitlab.xfce.org/panel-plugins/xfce4-systemload-plugin -%global minorversion 1.3 -%global xfceversion 4.16 +%global minorversion 1.4 +%global xfceversion 4.20 Name: xfce4-systemload-plugin -Version: 1.3.3 +Version: 1.4.0 Release: %autorelease Summary: Systemload monitor for the Xfce panel -# Automatically converted from old format: BSD - review is highly recommended. -License: LicenseRef-Callaway-BSD -URL: http://goodies.xfce.org/projects/panel-plugins/%{name} -#VCS: git:git://git.xfce.org/panel-plugins/xfce4-systemload-plugin -Source0: http://archive.xfce.org/src/panel-plugins/%{name}/%{minorversion}/%{name}-%{version}.tar.bz2 +License: BSD-2-Clause +URL: https://docs.xfce.org/panel-plugins/xfce4-systemload-plugin +Source0: https://archive.xfce.org/src/panel-plugins/%{name}/%{minorversion}/%{name}-%{version}.tar.xz %if 0%{?fedora} >= 39 ExcludeArch: %{ix86} %endif - - -BuildRequires: make BuildRequires: gcc-c++ -BuildRequires: libxfce4ui-devel >= %{xfceversion} -BuildRequires: xfce4-panel-devel >= %{xfceversion} -BuildRequires: upower-devel BuildRequires: gettext -BuildRequires: intltool +BuildRequires: libgtop2-devel +BuildRequires: libxfce4ui-devel >= %{xfceversion} +BuildRequires: libxfce4util-devel +BuildRequires: meson +BuildRequires: upower-devel +BuildRequires: xfce4-panel-devel >= %{xfceversion} +BuildRequires: xfconf-devel Requires: xfce4-panel >= %{xfceversion} @@ -36,29 +35,32 @@ load, the memory in use, the swap space and the system uptime. %prep -%setup -q +%autosetup %build -%configure --disable-static -%make_build +%meson +%meson_build + + +%check +%meson_test %install -%make_install +%meson_install -# remove la file -find %{buildroot} -name '*.la' -exec rm -f {} ';' - -# FIXME: make sure debuginfo is generated properly (#795107) -chmod -c +x %{buildroot}%{_libdir}/xfce4/panel/plugins/*.so +# 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 %license COPYING -%doc AUTHORS ChangeLog NEWS +%doc AUTHORS NEWS README.md %{_libdir}/xfce4/panel/plugins/*.so %{_datadir}/xfce4/panel/plugins/*.desktop %{_datadir}/icons/hicolor/*/apps/org.xfce.panel.systemload.*