Fix the build
thermal_monitor no longer ships bundled qcustomplot so we need to switch to the system copy instead.
This commit is contained in:
parent
ad42ff514e
commit
05fae885c3
@ -49,13 +49,12 @@ be easily enhanced.
|
|||||||
Summary: Application for monitoring %{name}
|
Summary: Application for monitoring %{name}
|
||||||
License: GPLv3+
|
License: GPLv3+
|
||||||
|
|
||||||
|
BuildRequires: qcustomplot-qt5-devel
|
||||||
BuildRequires: qt5-qtbase-devel
|
BuildRequires: qt5-qtbase-devel
|
||||||
|
|
||||||
Requires: hicolor-icon-theme
|
Requires: hicolor-icon-theme
|
||||||
Requires: %{name}%{?_isa} == %{version}-%{release}
|
Requires: %{name}%{?_isa} == %{version}-%{release}
|
||||||
|
|
||||||
Provides: bundled(qcustomplot) = 2.0.0-beta
|
|
||||||
|
|
||||||
%description monitor
|
%description monitor
|
||||||
This package contains an Application to monitor %{name} for system
|
This package contains an Application to monitor %{name} for system
|
||||||
developers who want to enable application developers and their
|
developers who want to enable application developers and their
|
||||||
@ -161,6 +160,7 @@ NO_CONFIGURE=1 ./autogen.sh
|
|||||||
|
|
||||||
# Build the monitor-app.
|
# Build the monitor-app.
|
||||||
pushd tools/thermal_monitor
|
pushd tools/thermal_monitor
|
||||||
|
sed -i -e 's/-lqcustomplot/-lqcustomplot-qt5/' ThermalMonitor.pro
|
||||||
%{__mkdir} -p %{_target_platform}
|
%{__mkdir} -p %{_target_platform}
|
||||||
pushd %{_target_platform}
|
pushd %{_target_platform}
|
||||||
%{qmake_qt5} ..
|
%{qmake_qt5} ..
|
||||||
@ -238,7 +238,7 @@ exit 0
|
|||||||
|
|
||||||
%files monitor
|
%files monitor
|
||||||
%doc fedora_addons/%{name}-monitor.ReadMe.txt
|
%doc fedora_addons/%{name}-monitor.ReadMe.txt
|
||||||
%license tools/thermal_monitor/qcustomplot/GPL.txt
|
%license tools/thermal_monitor/COPYING
|
||||||
%{_bindir}/ThermalMonitor
|
%{_bindir}/ThermalMonitor
|
||||||
%{_datadir}/applications/%{name}-monitor.desktop
|
%{_datadir}/applications/%{name}-monitor.desktop
|
||||||
%{_datadir}/icons/hicolor/scalable/apps/%{name}-monitor.svg
|
%{_datadir}/icons/hicolor/scalable/apps/%{name}-monitor.svg
|
||||||
|
Loading…
Reference in New Issue
Block a user