diff --git a/0001-fix-dmidecode17.patch b/0001-fix-dmidecode17.patch new file mode 100644 index 0000000000000000000000000000000000000000..c167f98e2fb29f2608ea065fdf3a7e438c5cf51e --- /dev/null +++ b/0001-fix-dmidecode17.patch @@ -0,0 +1,42 @@ +From cd14618b9dc8fce8a22cac9b17ccc96f2d36301d Mon Sep 17 00:00:00 2001 +From: liweigang +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 +--- + 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 &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 &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 + diff --git a/README.en.md b/README.en.md deleted file mode 100644 index e9b84ed42e81928b7a9c3e04a1f9b144649a6fb4..0000000000000000000000000000000000000000 --- a/README.en.md +++ /dev/null @@ -1,36 +0,0 @@ -# deepin-devicemanager - -#### Description -deepin devicemanager - -#### Software Architecture -Software architecture description - -#### Installation - -1. xxxx -2. xxxx -3. xxxx - -#### Instructions - -1. xxxx -2. xxxx -3. xxxx - -#### Contribution - -1. Fork the repository -2. Create Feat_xxx branch -3. Commit your code -4. Create Pull Request - - -#### Gitee Feature - -1. You can use Readme\_XXX.md to support different languages, such as Readme\_en.md, Readme\_zh.md -2. Gitee blog [blog.gitee.com](https://blog.gitee.com) -3. Explore open source project [https://gitee.com/explore](https://gitee.com/explore) -4. The most valuable open source project [GVP](https://gitee.com/gvp) -5. The manual of Gitee [https://gitee.com/help](https://gitee.com/help) -6. The most popular members [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/) diff --git a/README.md b/README.md deleted file mode 100644 index 678d51fcdab116dbef5fbf5b12c81110e145ebf1..0000000000000000000000000000000000000000 --- a/README.md +++ /dev/null @@ -1,37 +0,0 @@ -# deepin-devicemanager - -#### 介绍 -deepin devicemanager - -#### 软件架构 -软件架构说明 - - -#### 安装教程 - -1. xxxx -2. xxxx -3. xxxx - -#### 使用说明 - -1. xxxx -2. xxxx -3. xxxx - -#### 参与贡献 - -1. Fork 本仓库 -2. 新建 Feat_xxx 分支 -3. 提交代码 -4. 新建 Pull Request - - -#### 码云特技 - -1. 使用 Readme\_XXX.md 来支持不同的语言，例如 Readme\_en.md, Readme\_zh.md -2. 码云官方博客 [blog.gitee.com](https://blog.gitee.com) -3. 你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解码云上的优秀开源项目 -4. [GVP](https://gitee.com/gvp) 全称是码云最有价值开源项目，是码云综合评定出的优秀开源项目 -5. 码云官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help) -6. 码云封面人物是一档用来展示码云会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/) diff --git a/deepin-devicemanager.spec b/deepin-devicemanager.spec index 7bf7257ed704962c52240637ce83a4d34071cd86..30ddb4a79b2dd373323356b87cdd9ec4415b255f 100644 --- a/deepin-devicemanager.spec +++ b/deepin-devicemanager.spec @@ -1,17 +1,13 @@ -%define specrelease 1%{?dist} -%if 0%{?openeuler} -%define specrelease 1 -%endif - Name: deepin-devicemanager Version: 5.6.36 -Release: %{specrelease} +Release: 3 Summary: Device Manager is a handy tool for viewing hardware information and managing the devices License: GPLv3+ URL: https://github.com/linuxdeepin/deepin-devicemanager Source0: %{name}-%{version}.tar.gz Patch0: 0001-feat-add-A-help-files.patch Patch1: 0002-fix-Ethernet-Controller-X710-disable.patch +Patch2: 0001-fix-dmidecode17.patch BuildRequires: gcc-c++ BuildRequires: cmake3 @@ -48,6 +44,7 @@ Requires: util-linux %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build # help find (and prefer) qt5 utilities, e.g. qmake, lrelease @@ -79,6 +76,12 @@ systemctl enable deepin-devicemanager-server.service /etc/dbus-1/system.d/com.deepin.devicemanager.conf %changelog +* Tue Mar 26 2024 liweigang - 5.6.36-3 +- fix: Memory units in Device Manager do not match the memory rate units queried by typing dmidecode17 in the terminal + +* Tue Nov 28 2023 liuzhilin - 5.6.36-2 +- Remove unnecessary macro definitions + * Wed Jul 26 2023 leeffo - 5.6.36-1 - upgrade to version 5.6.36