!25 设备管理器中内存单位与终端中输入dmidecode17查询的内存速率单位不符合

From: @Venland 
Reviewed-by: @open-bot 
Signed-off-by: @open-bot

0001-fix-dmidecode17.patch

@@ -0,0 +1,42 @@
+From cd14618b9dc8fce8a22cac9b17ccc96f2d36301d Mon Sep 17 00:00:00 2001
+From: liweigang <izmirvii@gmail.com>
+Date: Fri, 22 Mar 2024 16:30:50 +0800
+Subject: [PATCH] =?UTF-8?q?fix:=20=E8=AE=BE=E5=A4=87=E7=AE=A1=E7=90=86?=
+ =?UTF-8?q?=E5=99=A8=E4=B8=AD=E5=86=85=E5=AD=98=E5=8D=95=E4=BD=8D=E4=B8=8E?=
+ =?UTF-8?q?=E7=BB=88=E7=AB=AF=E4=B8=AD=E8=BE=93=E5=85=A5dmidecode17?=
+ =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=9A=84=E5=86=85=E5=AD=98=E9=80=9F=E7=8E=87?=
+ =?UTF-8?q?=E5=8D=95=E4=BD=8D=E4=B8=8D=E7=AC=A6=E5=90=88?=
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: liweigang <izmirvii@gmail.com>
+---
+ deepin-devicemanager/src/DeviceManager/DeviceMemory.cpp | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/deepin-devicemanager/src/DeviceManager/DeviceMemory.cpp b/deepin-devicemanager/src/DeviceManager/DeviceMemory.cpp
+index 8d559de..8f95f25 100644
+--- a/deepin-devicemanager/src/DeviceManager/DeviceMemory.cpp
++++ b/deepin-devicemanager/src/DeviceManager/DeviceMemory.cpp
+@@ -35,8 +35,6 @@ void DeviceMemory::setInfoFromLshw(const QMap<QString, QString> &mapInfo)
+ 
+     // 设置内存速率
+     setAttribute(mapInfo, "clock", m_Speed);
+-    if (m_Speed.contains("MT/s"))
+-        m_Speed.replace("MT/s", "MHz");
+ 
+     // 由lshw设置基本信息
+     setAttribute(mapInfo, "width", m_TotalBandwidth);
+@@ -58,8 +56,6 @@ bool DeviceMemory::setInfoFromDmidecode(const QMap<QString, QString> &mapInfo)
+ 
+     // 设置配置频率
+     setAttribute(mapInfo, "Configured Memory Speed", m_ConfiguredSpeed);
+-    if (m_ConfiguredSpeed.contains("MT/s"))
+-        m_ConfiguredSpeed.replace("MT/s", "MHz");
+ 
+     // 由dmidecode设置基本属性
+     setAttribute(mapInfo, "Minimum Voltage", m_MinimumVoltage);
+-- 
+2.33.1
+

deepin-devicemanager.spec

@@ -1,157 +1,78 @@
-# Run tests in check section
-# disable for bootstrapping
-
-%bcond_with check
-
-%global with_debug 1
-%if 0%{?with_debug}
-%global debug_package   %{nil}
-%endif
-
-
-###deepin-devicemanager-5.5.4.4.orig.tar.xz
-
 Name:           deepin-devicemanager
-Version:        5.5.4.4
-Release:        1
-Summary:        Device Manager is a handy tool for viewing hardware information and managing the devices.
+Version:        5.6.32
+Release:        3
+Summary:        Device Manager is a handy tool for viewing hardware information and managing the devices
 License:        GPLv3+
-URL:            https://uos-packages.deepin.com/uos/pool/main/d/deepin-devicemanager/
-Source0:        %{name}-%{version}.orig.tar.xz
+URL:            https://github.com/linuxdeepin/deepin-devicemanager
+Source0:        %{name}-%{version}.tar.gz
+Patch0:         0001-fix-dmidecode17.patch
 
-BuildRequires:  qt5-qtbase-devel
-BuildRequires:  dtkwidget-devel
-BuildRequires:  dde-qt-dbus-factory-devel
-BuildRequires:  qt5-qtsvg-devel
-BuildRequires:  cups-devel
+BuildRequires: gcc-c++
+BuildRequires: cmake3
+BuildRequires: dtkwidget-devel
+BuildRequires: dtkgui-devel
+BuildRequires: systemd-devel
+BuildRequires: libicu-devel
+BuildRequires: qt5-rpm-macros
+BuildRequires: qt5-qtbase-devel
+BuildRequires: qt5-qttools-devel
+BuildRequires: cups-devel
+BuildRequires: pkgconfig(dframeworkdbus)
+BuildRequires: zeromq-devel
+BuildRequires: gtest-devel
+BuildRequires: qt5-qtbase-private-devel
+
+Requires: smartmontools
+Requires: dmidecode
+Requires: xorg-x11-server-utils
+Requires: hwinfo
+Requires: cups
+Requires: upower
+Requires: deepin-shortcut-viewer
+Requires: lshw
+Requires: util-linux
 
 %description
-Device Manager is a handy tool for viewing hardware information and managing the devices.
-
+%{summary}.
 
 %prep
-%autosetup
+%autosetup -p1
 
 %build
-mkdir build && cd build
-%{_libdir}/qt5/bin/qmake ..
-%{__make}
+# help find (and prefer) qt5 utilities, e.g. qmake, lrelease
+export PATH=%{_qt5_bindir}:$PATH
+sed -i "s|^cmake_minimum_required.*|cmake_minimum_required(VERSION 3.0)|" $(find . -name "CMakeLists.txt")
+
+mkdir build && pushd build
+%cmake ../ -DCMAKE_BUILD_TYPE=Release -DAPP_VERSION=%{version} -DVERSION=%{version}
+%make_build
+popd
 
 %install
-pushd %{_builddir}/%{name}-%{version}/build
-%make_install INSTALL_ROOT=%{buildroot}
-popd
+%make_install -C build INSTALL_ROOT="%buildroot"
+
+%post
+systemctl enable deepin-devicemanager-server.service
 
 
 %files
-%{_bindir}/deepin-devicemanager
-%{_bindir}/deepin-devicemanager-authenticateProxy
-%{_datadir}/%{name}/*
-%{_datadir}/applications/*
-%{_datadir}/icons/hicolor/scalable/apps/deepin-devicemanager.svg
-%{_datadir}/polkit-1/actions/com.deepin.pkexec.deepin-devicemanager-authenticateProxy.policy
-%license LICENSE
 %doc README.md
-
-
-
-
+%license LICENSE
+%{_bindir}/%{name}
+%{_datadir}/applications/%{name}.desktop
+%{_datadir}/%{name}/translations/*.qm
+%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
+/lib/systemd/system/deepin-devicemanager-server.service
+%{_bindir}/deepin-devicemanager-server
+%{_datadir}/deepin-manual/manual-assets/application/deepin-devicemanager/device-manager/*
+/etc/dbus-1/system.d/com.deepin.devicemanager.conf
 
 %changelog
-* Tue May 28 2019 Robin Lee <cheeselee@fedoraproject.org> - 3.17.0-2
-- Fix a security issue
+* Fri Mar 22 2024 liweigang <liweiganga@uniontech.com> - 5.6.32-3
+- fix: Memory units in Device Manager do not match the memory rate units queried by typing dmidecode17 in the terminal
 
-* Tue Feb 26 2019 mosquito <sensor.wen@gmail.com> - 3.17.0-1
-- Update to 3.17.0
+* Fri Nov 17 2023 hanshuang <hanshuang@uniontech.com> - 5.6.32-2
+- modify version info
 
-* Tue Feb 19 2019 Kalev Lember <klember@redhat.com> - 3.16.0-2
-- Rebuilt against fixed atk (#1626575)
-
-* Thu Jan 31 2019 mosquito <sensor.wen@gmail.com> - 3.16.0-1
-- Update to 3.16.0
-
-* Thu Jan 31 2019 Robin Lee <cheeselee@fedoraproject.org> - 3.12.0-3
-- Create deepin-sound-player user
-
-* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.12.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Wed Dec 12 2018 mosquito <sensor.wen@gmail.com> - 3.12.0-1
-- Update to 3.12.0
-
-* Thu Nov 29 2018 mosquito <sensor.wen@gmail.com> - 3.10.0-1
-- Update to 3.10.0
-
-* Wed Nov 21 2018 mosquito <sensor.wen@gmail.com> - 3.9.0-1
-- Update to 3.9.0
-
-* Fri Nov  9 2018 mosquito <sensor.wen@gmail.com> - 3.5.0-1
-- Update to 3.5.0
-
-* Sat Aug 25 2018 mosquito <sensor.wen@gmail.com> - 3.1.26-1
-- Update to 3.1.26
-- build error with gobject-introspection 1.58 by gir-generator
-  https://github.com/linuxdeepin/developer-center/issues/604
-
-* Tue Jul 31 2018 Florian Weimer <fweimer@redhat.com> - 3.1.20-3
-- Rebuild with fixed binutils
-
-* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.20-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Fri Feb 16 2018 mosquito <sensor.wen@gmail.com> - 3.1.20-1
-- Update to 3.1.20
-
-* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.18.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Thu Jan 11 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 3.1.18.1-2
-- Remove obsolete scriptlets
-
-* Thu Dec 21 2017 mosquito <sensor.wen@gmail.com> - 3.1.18.1-1
-- Update to 3.1.18.1
-
-* Wed Nov 15 2017 mosquito <sensor.wen@gmail.com> - 3.1.17-1
-- Update to 3.1.17
-
-* Fri Oct 27 2017 mosquito <sensor.wen@gmail.com> - 3.1.15-1
-- Update to 3.1.15
-
-* Mon Oct 16 2017 mosquito <sensor.wen@gmail.com> - 3.1.14-2
-- Fix out of memory on armv7hl
-
-* Sat Oct 14 2017 mosquito <sensor.wen@gmail.com> - 3.1.14-1
-- Update to 3.1.14
-
-* Sat Aug 26 2017 mosquito <sensor.wen@gmail.com> - 3.1.13-1
-- Update to 3.1.13
-
-* Tue Aug  8 2017 mosquito <sensor.wen@gmail.com> - 3.1.11-2
-- Rename deepin-api-devel to golang-deepin-api-devel
-
-* Tue Aug  1 2017 mosquito <sensor.wen@gmail.com> - 3.1.11-1
-- Update to 3.1.11
-
-* Fri Jul 14 2017 mosquito <sensor.wen@gmail.com> - 3.1.10-1.git79125e7
-- Update to 3.1.10
-
-* Fri May 19 2017 mosquito <sensor.wen@gmail.com> - 3.1.7-1.git4c8e030
-- Update to 3.1.7
-
-* Sun Feb 26 2017 mosquito <sensor.wen@gmail.com> - 3.1.2-1.gitf93dbd7
-- Update to 3.1.2
-
-* Tue Jan 17 2017 mosquito <sensor.wen@gmail.com> - 3.0.16.1-1.gitcfdb295
-- Update to 3.0.16.1
-
-* Mon Jan 16 2017 Jaroslav <cz.guardian@gmail.com> Stepanek 3.0.16-1
-- Update to version 3.0.16
-
-* Sun Dec 18 2016 Jaroslav <cz.guardian@gmail.com> Stepanek 3.0.15-1
-- Update to version 3.0.15
-
-* Wed Dec 07 2016 Jaroslav <cz.guardian@gmail.com> Stepanek 3.0.14-2
-- Changed compilation procedure
-
-* Wed Sep 28 2016 Jaroslav <cz.guardian@gmail.com> Stepanek 3.0.14-1
-- Initial package build
+* Mon Jun 13 2022 uoser <uoser@uniontech.com> - 5.6.32-1.01
+- update: update to 5.6.32-1.01

deepin-devicemanager.yaml

@@ -0,0 +1,4 @@
+version_control: github
+src_repo: linuxdeepin/deepin-devicemanager
+tag_prefix: ^v
+seperator: .