diff --git a/01_no-sysctl.patch b/01_no-sysctl.patch new file mode 100644 index 0000000..82b5a02 --- /dev/null +++ b/01_no-sysctl.patch @@ -0,0 +1,27 @@ +From: Yves-Alexis Perez +Date: Mon, 14 Jan 2019 13:38:45 +0100 +Subject: Inconditionnaly include err.h and errno.h + +HAVE_SYSCTL is false on new architectures like arm64 or x32, and build +will fail (#766766). +--- + panel-plugin/libacpi.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/panel-plugin/libacpi.c b/panel-plugin/libacpi.c +index 0755585..1789cba 100644 +--- a/panel-plugin/libacpi.c ++++ b/panel-plugin/libacpi.c +@@ -54,10 +54,10 @@ static int acpifd; + + #ifndef __linux__ + #include +-#include +-#include + #endif + ++#include ++#include + #endif + + #include "libacpi.h" diff --git a/xfce4-battery-plugin-1.1.3.tar.bz2 b/xfce4-battery-plugin-1.1.3.tar.bz2 new file mode 100644 index 0000000..1b51fea Binary files /dev/null and b/xfce4-battery-plugin-1.1.3.tar.bz2 differ diff --git a/xfce4-battery-plugin.spec b/xfce4-battery-plugin.spec index 2f65d50..e726aca 100644 --- a/xfce4-battery-plugin.spec +++ b/xfce4-battery-plugin.spec @@ -1,23 +1,22 @@ -%global minorversion 1.1 -%global xfceversion 4.16 +%global xfceversion 4.14 %global _hardened_build 1 Name: xfce4-battery-plugin -Version: 1.1.4 +Version: 1.1.3 Release: 1 Summary: Battery monitor panel plugin for Xfce License: GPLv2+ Group: Development/Libraries URL: http://goodies.xfce.org/projects/panel-plugins/%{name} -Source0: http://archive.xfce.org/src/panel-plugins/%{name}/%{minorversion}/%{name}-%{version}.tar.bz2 - +Source0: http://archive.xfce.org/src/panel-plugins/%{name}/1.1/%{name}-%{version}.tar.bz2 +Patch0: 01_no-sysctl.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +#BuildArch: noarch BuildRequires: gcc-c++ BuildRequires: libxfce4ui-devel >= %{xfceversion} BuildRequires: xfce4-panel-devel >= %{xfceversion} BuildRequires: gettext BuildRequires: intltool - Requires: xfce4-panel >= %{xfceversion} %description @@ -25,7 +24,7 @@ A battery monitor panel plugin for Xfce4, compatible with APM and ACPI, using either /proc files or the new sysfs files for recent kernels. %prep -%autosetup +%autosetup -p1 %build %configure @@ -44,14 +43,11 @@ chmod -c +x %{buildroot}%{_libdir}/xfce4/panel/plugins/*.so %files -f %{name}.lang %license COPYING -%doc AUTHORS COPYING.LIB ChangeLog +%doc AUTHORS COPYING.LIB ChangeLog README %{_libdir}/xfce4/panel/plugins/*.so %{_datadir}/xfce4/panel/plugins/*.desktop %{_datadir}/icons/hicolor/*/*/* %changelog -* Fri Jun 18 2021 zhanglin - 1.1.4-1 -- Update to 1.1.4 - * Tue Jul 14 2020 Dillon Chen - 1.1.3-1 - Init package