diff --git a/.gitignore b/.gitignore index 9fd9b88..3236a83 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,12 @@ -/xfce4-systemload-plugin-*.tar.bz2 -/xfce4-systemload-plugin-*.tar.xz +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 diff --git a/sources b/sources index 897b246..83c3871 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xfce4-systemload-plugin-1.4.0.tar.xz) = ebb444eb91f032eb64f5b38e14d1a6e9e23ac0c38f41705d389e48878540663556435d26997de88a3116351bd72db8b02718cdd525961f8e35c62a3980438e68 +SHA512 (xfce4-systemload-plugin-1.3.1.tar.bz2) = 2b2285c5960a5728dd7818f90605848e462fe5fef8643ff5be64b7087225399395ace5ec8013f6795d410b0acf79ec77c14e2ed0e56007cfe6f13133ba708876 diff --git a/xfce4-systemload-plugin.spec b/xfce4-systemload-plugin.spec index c96988e..11b7733 100644 --- a/xfce4-systemload-plugin.spec +++ b/xfce4-systemload-plugin.spec @@ -1,31 +1,25 @@ # Review: https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=173668 -# VCS https://gitlab.xfce.org/panel-plugins/xfce4-systemload-plugin -%global minorversion 1.4 -%global xfceversion 4.20 +%global minorversion 1.3 +%global xfceversion 4.16 Name: xfce4-systemload-plugin -Version: 1.4.0 +Version: 1.3.1 Release: %autorelease Summary: Systemload monitor for the Xfce panel -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 +License: 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 +BuildRequires: make BuildRequires: gcc-c++ -BuildRequires: gettext -BuildRequires: libgtop2-devel BuildRequires: libxfce4ui-devel >= %{xfceversion} -BuildRequires: libxfce4util-devel -BuildRequires: meson -BuildRequires: upower-devel BuildRequires: xfce4-panel-devel >= %{xfceversion} -BuildRequires: xfconf-devel +BuildRequires: upower-devel +BuildRequires: gettext +BuildRequires: intltool Requires: xfce4-panel >= %{xfceversion} @@ -35,32 +29,29 @@ load, the memory in use, the swap space and the system uptime. %prep -%autosetup +%setup -q %build -%meson -%meson_build - - -%check -%meson_test +%configure --disable-static +%make_build %install -%meson_install +%make_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 +# 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 %find_lang %{name} %files -f %{name}.lang %license COPYING -%doc AUTHORS NEWS README.md +%doc AUTHORS ChangeLog NEWS %{_libdir}/xfce4/panel/plugins/*.so %{_datadir}/xfce4/panel/plugins/*.desktop %{_datadir}/icons/hicolor/*/apps/org.xfce.panel.systemload.*