diff --git a/0001-feat-add-missing-include.patch b/0001-feat-add-missing-include.patch new file mode 100644 index 0000000000000000000000000000000000000000..e68c0eb6430df83430ffa0e94ad668fa0865854c --- /dev/null +++ b/0001-feat-add-missing-include.patch @@ -0,0 +1,53 @@ +From 075bcd9b83fe4ac7057b3f2a40cc869538ac0207 Mon Sep 17 00:00:00 2001 +From: liweigang +Date: Thu, 12 Oct 2023 11:06:17 +0800 +Subject: [PATCH] feat: add missing include + +--- + net-view/operation/private/netmanagerthreadprivate.cpp | 2 ++ + net-view/operation/private/netsecretagent.cpp | 2 ++ + src/impl/networkmanager/activeconnectioninfo.cpp | 2 ++ + 3 files changed, 6 insertions(+) + +diff --git a/net-view/operation/private/netmanagerthreadprivate.cpp b/net-view/operation/private/netmanagerthreadprivate.cpp +index f9b0626..d08a4b5 100644 +--- a/net-view/operation/private/netmanagerthreadprivate.cpp ++++ b/net-view/operation/private/netmanagerthreadprivate.cpp +@@ -24,6 +24,8 @@ + + #include + #include ++#include ++#include + + using namespace NetworkManager; + +diff --git a/net-view/operation/private/netsecretagent.cpp b/net-view/operation/private/netsecretagent.cpp +index 5626e34..2fe8134 100644 +--- a/net-view/operation/private/netsecretagent.cpp ++++ b/net-view/operation/private/netsecretagent.cpp +@@ -14,6 +14,8 @@ + #include + #include + #include ++#include ++#include + + static const QString NetworkDialogApp = "dde-network-dialog"; // 网络列表执行文件 + +diff --git a/src/impl/networkmanager/activeconnectioninfo.cpp b/src/impl/networkmanager/activeconnectioninfo.cpp +index 8d0b73d..a68a324 100644 +--- a/src/impl/networkmanager/activeconnectioninfo.cpp ++++ b/src/impl/networkmanager/activeconnectioninfo.cpp +@@ -8,6 +8,8 @@ + #include + #include + ++#include ++ + using namespace dde::network; + + #define ServiceTypeL2TP "org.freedesktop.NetworkManager.l2tp" +-- +2.20.1 + diff --git a/README.en.md b/README.en.md deleted file mode 100644 index d4ab30454e46060a4ddbfd7c7122ec60d4a84e6c..0000000000000000000000000000000000000000 --- a/README.en.md +++ /dev/null @@ -1,36 +0,0 @@ -# dde-network-core - -#### Description -Deepin desktop-environment - network core files - -#### 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 2f1d2d0b3da1ee02808416721c12a019f612d507..0000000000000000000000000000000000000000 --- a/README.md +++ /dev/null @@ -1,37 +0,0 @@ -# dde-network-core - -#### 介绍 -Deepin desktop-environment - network core files - -#### 软件架构 -软件架构说明 - - -#### 安装教程 - -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. Gitee 官方博客 [blog.gitee.com](https://blog.gitee.com) -3. 你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解 Gitee 上的优秀开源项目 -4. [GVP](https://gitee.com/gvp) 全称是 Gitee 最有价值开源项目，是综合评定出的优秀开源项目 -5. Gitee 官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help) -6. Gitee 封面人物是一档用来展示 Gitee 会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/) diff --git a/dde-network-core-1.0.74.tar.gz b/dde-network-core-1.0.74.tar.gz deleted file mode 100644 index 1df71e8244eccb60fcd5c8847be1dc9a9d29f5c1..0000000000000000000000000000000000000000 Binary files a/dde-network-core-1.0.74.tar.gz and /dev/null differ diff --git a/dde-network-core-1.1.28.1.tar.gz b/dde-network-core-1.1.28.1.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..1bb6b0bec63d403004ed4ea14f3a92161609fc03 Binary files /dev/null and b/dde-network-core-1.1.28.1.tar.gz differ diff --git a/dde-network-core.spec b/dde-network-core.spec index 48032e9a583ae00fa9e3d01bc2cf0c5eaaabc28f..4415c0b7a43ce69a83d0d0757f24647ecee91a4c 100644 --- a/dde-network-core.spec +++ b/dde-network-core.spec @@ -1,10 +1,14 @@ +%undefine _ld_as_needed +%define __cmake_builddir $(pwd) Name: dde-network-core -Version: 1.0.74 -Release: 1 +Version: 1.1.28.1 +Release: 1%{?dist}.01 Summary: Deepin desktop-environment - network core files License: GPLv3 URL: https://github.com/linuxdeepin/dde-network-core -Source0: %{name}-%{version}.tar.gz +Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz + +Patch0001: 0001-feat-add-missing-include.patch BuildRequires: gcc-c++ BuildRequires: cmake @@ -26,9 +30,12 @@ BuildRequires: dde-control-center-devel BuildRequires: dde-dock-devel BuildRequires: dde-qt-dbus-factory-devel BuildRequires: dde-session-shell-devel +BuildRequires: systemd-devel + BuildRequires: gtest-devel -BuildRequires: gmock-devel +BuildRequires: gmock + Obsoletes: dde-network-utils <= 5.4.15 %description @@ -43,7 +50,7 @@ Obsoletes: dde-network-utils-devel <= 5.4.15 Header files and libraries for %{name}. %prep -%autosetup +%autosetup -p1 sed -i 's|lib/|%{_lib}/|' dock-network-plugin/CMakeLists.txt @@ -59,16 +66,15 @@ cd build %files %doc README.md -%{_bindir}/dde-network-dialog %{_prefix}/lib/dde-control-center/ %{_libdir}/dde-dock/ %{_prefix}/lib/dde-session-shell/ %{_libdir}/libdde-network-core.so* %{_datadir}/dsg/ %{_datadir}/dcc-network-plugin/ -%{_datadir}/dde-network-dialog/ %{_datadir}/dock-network-plugin/ %{_datadir}/dss-network-plugin/ +%{_datadir}/dde-network-core/translations/*.qm /var/lib/polkit-1/localauthority/10-vendor.d/10-network-manager.pkla %files devel @@ -76,5 +82,33 @@ cd build %{_libdir}/pkgconfig/*.pc %changelog -* Mon Aug 14 2023 leeffo - 1.0.74-1 +* Wed Aug 28 2024 pangqing - 1.1.28.1-1.01 +- modify macros (fix dde-network-core build error) + +* Mon Oct 09 2023 liweigang - 1.1.28.1-1 +- update: update to version 1.1.28.1 + +* Mon Sep 18 2023 liuzhilin - 1.1.18.4-1.01 +- spec: add buildrequires gmock + +* Wed Aug 16 2023 liuzhilin - 1.1.18.4-1 +- update: update to 1.1.18.4 + +* Fri Mar 31 2023 mahailiang - 1.0.74-5 +- rebuild + +* Fri Feb 03 2023 liweiganga - 1.0.74-4 +- spec: del provided +- spec: fix plugins path + +* Fri Feb 03 2023 liweiganga - 1.0.74-3 +- spec: temporarily provided to support compilation + +* Fri Feb 03 2023 liweiganga - 1.0.74-2 +- spec: fix error Obsoletes version + +* Thu Feb 02 2023 liweiganga - 1.0.74-1.01 +- spec: fix plugins path + +* Fri Jan 06 2023 liweiganga - 1.0.74-1 - init: init package diff --git a/dde-network-core.yaml b/dde-network-core.yaml deleted file mode 100644 index 2e41c796cdb95bd2c2a245e6bab80bff4ecbf7cf..0000000000000000000000000000000000000000 --- a/dde-network-core.yaml +++ /dev/null @@ -1,4 +0,0 @@ -version_control: github -src_repo: linuxdeepin/dde-network-core -tag_prefix: ^v -separator: .