Compare commits

...
Sign in to create a new pull request.

6 commits

Author SHA1 Message Date
Mukundan Ragavan
a65c47491a define G_GNUC_FALLTHROUGH for glib < 2.60 2021-08-02 14:44:13 -04:00
Mukundan Ragavan
c9b1039ac1 Update to 1.3.1 2021-08-02 12:28:39 -04:00
Troy Dawson
8d1c5afb61 remove package.cfg per new epel-playground policy 2020-09-24 16:04:48 +00:00
Mukundan Ragavan
e30dc925fd Exclude s390x and aarch64 until we have upower 2019-12-14 16:22:17 -05:00
Mukundan Ragavan
3534adcd90 Xfce 4.14 on EPEL8 2019-12-13 20:54:21 -05:00
Gwyn Ciesla
31daa3efce "Adding package.cfg file" 2019-12-13 09:05:54 -06:00
4 changed files with 41 additions and 11 deletions

1
.gitignore vendored
View file

@ -7,3 +7,4 @@ xfce4-systemload-plugin-0.4.2.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.3.1.tar.bz2

View file

@ -0,0 +1,19 @@
--- panel-plugin/cpu.h.orig 2021-08-02 14:16:48.329366967 -0400
+++ panel-plugin/cpu.h 2021-08-02 14:17:07.782923109 -0400
@@ -32,3 +32,16 @@
gulong read_cpuload(void);
#endif /* ndef __CPU_H */
+
+/* G_GNUC_FALLTHROUGH definition, from GLib 2.68.0 */
+
+#if ! GLIB_CHECK_VERSION (2, 60, 0)
+#if __GNUC__ > 6
+#define G_GNUC_FALLTHROUGH __attribute__((fallthrough))
+#elif g_macro__has_attribute (fallthrough)
+#define G_GNUC_FALLTHROUGH __attribute__((fallthrough))
+#else
+#define G_GNUC_FALLTHROUGH
+#endif
+#endif
+

View file

@ -1 +1 @@
SHA512 (xfce4-systemload-plugin-1.2.3.tar.bz2) = 98985b2250bfff3ae8314f5671ec4438f4c53702cf9e1b76563cdc5d1b4b62174d6cfa559603294c1fc8fbbd5e15a833cc112c75b106a85b1e11788ded4da538
SHA512 (xfce4-systemload-plugin-1.3.1.tar.bz2) = 2b2285c5960a5728dd7818f90605848e462fe5fef8643ff5be64b7087225399395ace5ec8013f6795d410b0acf79ec77c14e2ed0e56007cfe6f13133ba708876

View file

@ -1,22 +1,19 @@
# Review: https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=173668
%global minorversion 1.2
%if 0%{?fedora} >= 29
%global xfceversion 4.14
%else
%global xfceversion 4.12
%endif
%global minorversion 1.3
%global xfceversion 4.16
Name: xfce4-systemload-plugin
Version: 1.2.3
Release: 1%{?dist}
Version: 1.3.1
Release: 2%{?dist}
Summary: Systemload monitor for the Xfce panel
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
Patch0: define_G_GNUC_FALLTHROUGH.patch
BuildRequires: gcc-c++
BuildRequires: libxfce4ui-devel >= %{xfceversion}
BuildRequires: xfce4-panel-devel >= %{xfceversion}
@ -24,6 +21,8 @@ BuildRequires: upower-devel
BuildRequires: gettext
BuildRequires: intltool
ExcludeArch: aarch64 s390x
Requires: xfce4-panel >= %{xfceversion}
%description
@ -34,6 +33,7 @@ load, the memory in use, the swap space and the system uptime.
%prep
%setup -q
%patch0
%build
%configure --disable-static
@ -54,11 +54,21 @@ chmod -c +x %{buildroot}%{_libdir}/xfce4/panel/plugins/*.so
%files -f %{name}.lang
%license COPYING
%doc AUTHORS ChangeLog NEWS README
%doc AUTHORS ChangeLog NEWS
%{_libdir}/xfce4/panel/plugins/*.so
%{_datadir}/xfce4/panel/plugins/*.desktop
%{_datadir}/icons/hicolor/*/apps/org.xfce.panel.systemload.*
%changelog
* Mon Aug 02 2021 Mukundan Ragavan <nonamedotc@fedoraproject.org> - 1.3.1-2
- define G_GNUC_FALLTHROUGH for glib < 2.60
* Mon Aug 02 2021 Mukundan Ragavan <nonamedotc@fedoraproject.org> - 1.3.1-1
- Update to 1.3.1
* Sat Dec 14 2019 Mukundan Ragavan <nonamedotc@fedoraproject.org> - 1.2.3-2
- Exclude s390x and aarch64 until we have upower
* Tue Aug 13 2019 Mukundan Ragavan <nonamedotc@fedoraproject.org> - 1.2.3-1
- Update to 1.2.3