0001-Fix-multiple-definition-errors-under-GCC-10.0.patch

@@ -0,0 +1,115 @@
+From 6c6de7c07290248a3c72a50c7790885ee4bc13a2 Mon Sep 17 00:00:00 2001
+From: Robin Lee <cheeselee@fedoraproject.org>
+Date: Mon, 24 Feb 2020 17:52:39 +0800
+Subject: [PATCH] Fix multiple definition errors under GCC 10.0
+
+Fixes #16436, RHBZ#1800268
+---
+ include/sensors-interface-common.h | 22 ++++++++++++++--------
+ lib/sensors-interface-common.c     |  1 +
+ 2 files changed, 15 insertions(+), 8 deletions(-)
+
+diff --git a/include/sensors-interface-common.h b/include/sensors-interface-common.h
+index 62a27eb..05146c5 100644
+--- a/include/sensors-interface-common.h
++++ b/include/sensors-interface-common.h
+@@ -146,6 +146,12 @@ t_sensors_dialog;
+ 
+ 
+ 
++#ifdef XFCE4_SENSORS_INTERFACE_COMMON_DEFINING
++#define EXTERN
++#else
++#define EXTERN extern
++#endif
++
+ /* Extern functions that need to be re-implemented in the sensors-viewer and
+  * the panel code.
+  * They kind of need to be registered at the library by any software
+@@ -157,7 +163,7 @@ t_sensors_dialog;
+  * @param ptr_widget: Pointer to original widget, i.e, the update timer box
+  * @param ptr_sensorsdialog: argument pointer to sensors dialog data
+  */
+-void
++EXTERN void
+ (*adjustment_value_changed) (GtkWidget *ptr_widget,
+                              t_sensors_dialog *ptr_sensorsdialog);
+ 
+@@ -167,7 +173,7 @@ void
+  * @param ptr_widget: Pointer to original widget, i.e, the sensor entry combobox
+  * @param ptr_sensorsdialog: argument pointer to sensors dialog data
+  */
+-void
++EXTERN void
+ (*sensor_entry_changed) (GtkWidget *ptr_widget,
+                          t_sensors_dialog *ptr_sensorsdialog);
+ 
+@@ -178,7 +184,7 @@ void
+  * @param ptr_str_newtext: Pointer to the string containing the new label
+  * @param ptr_sensorsdialog: argument pointer to sensors dialog data
+  */
+-void
++EXTERN void
+ (*list_cell_text_edited) (GtkCellRendererText *ptr_cellrenderertext,
+                           gchar *ptr_str_path, gchar *ptr_str_newtext,
+                           t_sensors_dialog *ptr_sensorsdialog);
+@@ -189,7 +195,7 @@ void
+  * @param ptr_str_path: pointer to the string with the path of the changed item
+  * @param ptr_sensorsdialog: argument pointer to sensors dialog data
+  */
+-void
++EXTERN void
+ (*list_cell_toggle) (GtkCellRendererToggle *ptr_cellrenderertoggle, gchar *ptr_str_path,
+                      t_sensors_dialog *ptr_sensorsdialog);
+ 
+@@ -201,7 +207,7 @@ void
+  *                          hexadecimal rgb format #0011ff
+  * @param ptr_sensorsdialog: argument pointer to sensors dialog data
+  */
+-void
++EXTERN void
+ (*list_cell_color_edited) (GtkCellRendererText *ptr_cellrenderertext,
+                            gchar *ptr_str_path, gchar *ptr_str_newcolor,
+                            t_sensors_dialog *ptr_sensorsdialog);
+@@ -214,7 +220,7 @@ void
+  *                        temperature
+  * @param ptr_sensorsdialog: argument pointer to sensors dialog data
+  */
+-void
++EXTERN void
+ (*minimum_changed) (GtkCellRendererText *ptr_cellrenderertext, gchar *ptr_str_path,
+                     gchar *ptr_str_newmin, t_sensors_dialog *ptr_sensorsdialog);
+ 
+@@ -226,7 +232,7 @@ void
+  *                        temperature
+  * @param ptr_sensorsdialog: argument pointer to sensors dialog data
+  */
+-void
++EXTERN void
+ (*maximum_changed) (GtkCellRendererText *ptr_cellrenderertext, gchar *ptr_str_path,
+                     gchar *ptr_str_newmax, t_sensors_dialog *ptr_sensorsdialog);
+ 
+@@ -236,7 +242,7 @@ void
+  * @param ptr_widget: Pointer to original widget, i.e, the update timer box
+  * @param ptr_sensorsdialog: argument pointer to sensors dialog data
+  */
+-void
++EXTERN void
+ (*temperature_unit_change) (GtkWidget *ptr_widget,
+                             t_sensors_dialog *ptr_sensorsdialog);
+ 
+diff --git a/lib/sensors-interface-common.c b/lib/sensors-interface-common.c
+index 70aa154..8c79f1d 100644
+--- a/lib/sensors-interface-common.c
++++ b/lib/sensors-interface-common.c
+@@ -28,6 +28,7 @@
+ #include <libxfce4panel/xfce-panel-plugin.h>
+ 
+ /* Local/package includes */
++#define XFCE4_SENSORS_INTERFACE_COMMON_DEFINING
+ #include <configuration.h>
+ #include <sensors-interface-common.h>
+ #include <middlelayer.h>
+-- 
+2.24.1
+

xfce4-sensors-plugin.spec

@@ -1,17 +1,16 @@
-%global minorversion 1.4
+%global xfceversion 4.14
-%global xfceversion 4.16
 
 Name:           xfce4-sensors-plugin
-Version:        1.4.4
+Version:        1.3.92
-Release:        3
+Release:        1
 Summary:        Hardware sensors plugin for the Xfce panel
 License:        GPLv2+
-URL:            https://goodies.xfce.org/projects/panel-plugins/%{name}
+#Group:          Development/Libraries
-Source0:        https://archive.xfce.org/src/panel-plugins/%{name}/%{minorversion}/%{name}-%{version}.tar.bz2
+URL:            http://goodies.xfce.org/projects/panel-plugins/%{name}
-
+Source0:        http://archive.xfce.org/src/panel-plugins/%{name}/1.3/%{name}-%{version}.tar.bz2
+Patch0:         0001-Fix-multiple-definition-errors-under-GCC-10.0.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  make
+#BuildArch:      noarch
-BuildRequires:  gcc-c++
 BuildRequires:  libnotify-devel >= 0.4
 BuildRequires:  libxfce4ui-devel >= %{xfceversion}
 BuildRequires:  lm_sensors-devel >= 2.8
@@ -21,9 +20,8 @@ BuildRequires:  gettext
 BuildRequires:  hddtemp
 BuildRequires:  intltool
 BuildRequires:  libtool
-BuildRequires:  chrpath
-
 Requires:       hddtemp
+Requires:       libxfce4util-devel
 Requires:       lm_sensors >= 2.8
 Requires:       xfce4-panel >= %{xfceversion}
 
@@ -31,30 +29,18 @@ Requires:       xfce4-panel >= %{xfceversion}
 The sensors plugin provides a handy way to monitor your hard disk,
 processor, fans, and other critical hardware right on your Xfce panel.
 
-%package        devel
-Summary:        Development files for xfce4-sensors-plugin
-Requires:       %{name} = %{version}-%{release}
-Requires:       libxfce4util-devel
-
-%description    devel
-Static libraries and header files for the xfce4-sensors-plugin.
-
 %prep
 %autosetup -p1
 
 %build
 %configure --disable-static \
-           --enable-sysfsacpi=yes \
+        --enable-sysfsacpi=yes \
-           --with-pathhddtemp=%{_bindir}/hddtemp
+        --with-pathhddtemp=%{_bindir}/hddtemp
 %make_build
 
+
 %install
 %make_install
-chrpath -d %{buildroot}%{_bindir}/xfce4-sensors
-chrpath -d %{buildroot}%{_libdir}/xfce4/panel/plugins/libxfce4-sensors-plugin.so
-chrpath -d %{buildroot}%{_libdir}/xfce4/modules/libxfce4sensors.so.*
-mkdir -p %{buildroot}/etc/ld.so.conf.d
-echo "%{_libdir}/xfce4/modules" > %{buildroot}/etc/ld.so.conf.d/%{name}-%{_arch}.conf
 
 %find_lang %{name}
 
@@ -68,17 +54,13 @@ desktop-file-install --vendor "" \
         --delete-original \
         %{buildroot}%{_datadir}/applications/xfce4-sensors.desktop
 
-%post
-/sbin/ldconfig
-
-%postun
-/sbin/ldconfig
-
 %files -f %{name}.lang
 %license COPYING
-%doc AUTHORS ChangeLog NEWS TODO
+%doc AUTHORS ChangeLog NEWS README TODO
 %{_bindir}/xfce4-sensors
 %dir %{_libdir}/xfce4/modules/
+%{_libdir}/pkgconfig/libxfce4sensors-1.0.pc
+%{_libdir}/xfce4/modules/libxfce4sensors.so
 %{_libdir}/xfce4/modules/libxfce4sensors.so.*
 %{_libdir}/xfce4/panel/plugins/libxfce4-sensors-plugin.so
 %{_datadir}/applications/xfce4-sensors.desktop
@@ -86,27 +68,7 @@ desktop-file-install --vendor "" \
 %{_datadir}/icons/hicolor/scalable/apps/xfce-sensors.svg
 %{_datadir}/xfce4/panel/plugins/xfce4-sensors-plugin.*
 %{_mandir}/man1/xfce4-sensors.1.gz
-%config(noreplace) /etc/ld.so.conf.d/*
-
-%files devel
-%{_libdir}/pkgconfig/libxfce4sensors-1.0.pc
-%{_libdir}/xfce4/modules/libxfce4sensors.so
 
 %changelog
-* Fri Mar 24 2023 lin zhang <lin.zhang@turbolinux.com.cn> - 1.4.4-3
-- add library path file to /etc/ld.so.conf.d
-
-* Mon Mar 13 2023 lin zhang <lin.zhang@turbolinux.com.cn> - 1.4.4-2
-- remove rpath
-
-* Mon Jan 02 2023 lin zhang <lin.zhang@turbolinux.com.cn> - 1.4.4-1
-- update to 1.4.4
-
-* Wed Aug 18 2021 zhanglin <lin.zhang@turbolinux.com.cn> - 1.3.95-2
-- fix Require libxfce4ui-1
-
-* Fri Jun 18 2021 zhanglin <lin.zhang@turbolinux.com.cn> - 1.3.95-1
-- Update to 1.3.95
-
 * Mon Jul 27 2020 Dillon Chen <dillon.chen@turbolinux.com.cn> - 1.3.92-1
 - Init package