!20 回合SP3版本代码

From: @lvgenggeng 
Reviewed-by: @xzyangha 
Signed-off-by: @xzyangha

README.en.md

@@ -1,36 +0,0 @@
-# dtkcore
-
-#### Description
-dtkcore
-
-#### 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/)

README.md

@@ -1,37 +0,0 @@
-# dtkcore
-
-#### 介绍
-dtkcore
-
-#### 软件架构
-软件架构说明
-
-
-#### 安装教程
-
-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/)

dtkcore.spec

@@ -1,18 +1,27 @@
 Name:           dtkcore
-Version:        5.2.1
+Version:        5.5.35
 Release:        1
 Summary:        Deepin tool kit core modules
-License:        GPLv3
+License:        LGPLv3+
 URL:            https://github.com/linuxdeepin/dtkcore
-Source0:        %{name}_%{version}.orig.tar.xz
+Source0:        %{name}-%{version}.tar.gz
+
 BuildRequires:  gcc-c++
-BuildRequires:  annobin
+#BuildRequires:  annobin
 BuildRequires:  pkgconfig(Qt5Core)
 BuildRequires:  pkgconfig(gsettings-qt)
+BuildRequires:  gtest-devel
+BuildRequires:  qt5-qttools-devel
+BuildRequires:  dtkcommon-devel
+BuildRequires:  qt5-qtbase-private-devel
+BuildRequires:  make
+
+# since f30
 Obsoletes:      deepin-tool-kit <= 0.3.3
 Obsoletes:      deepin-tool-kit-devel <= 0.3.3
 Obsoletes:      dtksettings <= 0.1.7
 Obsoletes:      dtksettings-devel <= 0.1.7
+Obsoletes:      dtkcore2
 
 %description
 Deepin tool kit core modules.
@@ -20,16 +29,17 @@ Deepin tool kit core modules.
 %package devel
 Summary:        Development package for %{name}
 Requires:       %{name}%{?_isa} = %{version}-%{release}
-Requires:       qt5-qtbase-devel
+Requires:       dtkcommon-devel
+Requires:       qt5-qtbase-devel%{?_isa}
 
 %description devel
 Header files and libraries for %{name}.
 
 %prep
-%setup -q
+%autosetup -p1
 
-sed -i 's|/lib|/libexec|' tools/settings/settings.pro
 %build
+# help find (and prefer) qt5 utilities, e.g. qmake, lrelease
 export PATH=%{_qt5_bindir}:$PATH
 %qmake_qt5 PREFIX=%{_prefix} \
            DTK_VERSION=%{version} \
@@ -41,30 +51,45 @@ export PATH=%{_qt5_bindir}:$PATH
 %install
 %make_install INSTALL_ROOT=%{buildroot}
 
-%ldconfig_scriptlets
-
 %files
 %doc README.md
 %license LICENSE
-%{_libdir}/libdtkcore.so.*
+%{_libdir}/lib%{name}.so*
+%dir %{_libexecdir}/dtk5/
 %{_libexecdir}/dtk5/dtk-settings
-%{_libexecdir}/dtk5/dtk-license.py*
+%{_libexecdir}/dtk5/dtk-license.py
-%{_libexecdir}/dtk5/dtk-translate.py*
+%{_libexecdir}/dtk5/dtk-translate.py
 %{_libexecdir}/dtk5/deepin-os-release
+%{_bindir}/qdbusxml2cpp-fix
 
 %files devel
 %doc doc/Specification.md
 %{_includedir}/libdtk-*/
-%{_qt5_archdatadir}/mkspecs/features/*.prf
 %{_qt5_archdatadir}/mkspecs/modules/*.pri
-%{_libdir}/cmake/Dtk/
 %{_libdir}/cmake/DtkCore/
 %{_libdir}/cmake/DtkCMake/
 %{_libdir}/cmake/DtkTools/
 %{_libdir}/pkgconfig/dtkcore.pc
-%{_libdir}/libdtkcore.so
+%{_libdir}/lib%{name}.so
-/usr/share/glib-2.0/schemas/*
 
 %changelog
+* Tue Jun 18 2024 lvgenggeng <lvgenggeng@uniontech.com> - 5.5.35-1
+- update: upgrade to version 5.5.35
+
+* Wed Mar 22 2023 liweiganga <liweiganga@uniontech.com> - 5.5.19-1
+- update: update to 5.5.19
+
+* Thu Jul 28 2022 liweiganga <liweiganga@uniontech.com> - 5.4.11.2-2
+- fix install conflict
+
+* Tue Jul 19 2022 konglidong <konglidong@uniontech.com> - 5.4.11.2-1
+- Update to 5.4.11.2
+
+* Thu Jul 15 2021 weidong <weidong@uniontech.com> - 5.2.2.3-2
+- Format specfile.
+
+* Mon Jul 12 2021 weidong <weidong@uniontech.com> - 5.2.2.3-1
+- Update 5.2.2.3
+
 * Thu Jul 30 2020 openEuler Buildteam <buildteam@openeuler.org> - 5.2.1-1
 - Package init