From 56ff44428ba7ac32cc0fdf971fdc900b09b91a54 Mon Sep 17 00:00:00 2001 From: mosquito Date: Nov 14 2018 20:41:14 +0000 Subject: Release 2.0.9.8 --- diff --git a/.gitignore b/.gitignore index ef125d8..2801934 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /dtkcore-2.0.5.3.tar.gz /dtkcore-2.0.6.tar.gz /dtkcore-2.0.9.tar.gz +/dtkcore-2.0.9.8.tar.gz diff --git a/dtkcore.spec b/dtkcore.spec index ef4f78c..c797182 100644 --- a/dtkcore.spec +++ b/dtkcore.spec @@ -1,6 +1,6 @@ Name: dtkcore -Version: 2.0.9 -Release: 4%{?dist} +Version: 2.0.9.8 +Release: 1%{?dist} Summary: Deepin tool kit core modules License: GPLv3 URL: https://github.com/linuxdeepin/dtkcore @@ -28,7 +28,10 @@ sed -i 's|/lib|/libexec|' tools/settings/settings.pro sed -i 's|lrelease|lrelease-qt5|' tools/script/dtk-translate.py src/dtk_translation.prf %build -%qmake_qt5 PREFIX=%{_prefix} LIB_INSTALL_DIR=%{_libdir} +%qmake_qt5 PREFIX=%{_prefix} \ + LIB_INSTALL_DIR=%{_libdir} \ + BIN_INSTALL_DIR=%{_libexecdir}/dtk2 \ + TOOL_INSTALL_DIR=%{_libexecdir}/dtk2 %make_build %install @@ -45,6 +48,7 @@ sed -i 's|lrelease|lrelease-qt5|' tools/script/dtk-translate.py src/dtk_translat %{_libexecdir}/dtk2/dtk-settings %{_libexecdir}/dtk2/dtk-license.py* %{_libexecdir}/dtk2/dtk-translate.py* +%{_libexecdir}/dtk2/deepin-os-release %files devel %doc doc/Specification.md @@ -53,10 +57,14 @@ sed -i 's|lrelease|lrelease-qt5|' tools/script/dtk-translate.py src/dtk_translat %{_qt5_archdatadir}/mkspecs/modules/*.pri %{_libdir}/cmake/Dtk/DtkConfig.cmake %{_libdir}/cmake/DtkCore/DtkCoreConfig.cmake +%{_libdir}/cmake/DtkCMake/DtkCMakeConfig.cmake %{_libdir}/pkgconfig/*.pc %{_libdir}/lib*.so %changelog +* Fri Nov 9 2018 mosquito - 2.0.9.8-1 +- Update to 2.0.9.8 + * Sat Aug 25 2018 mosquito - 2.0.9-4 - Fix symbol diff --git a/fix-symbol.patch b/fix-symbol.patch index 4109bf8..a7b09b3 100644 --- a/fix-symbol.patch +++ b/fix-symbol.patch @@ -1,5 +1,5 @@ diff --git a/src/filesystem/dpathbuf.h b/src/filesystem/dpathbuf.h -index 3aa7609..85df90d 100644 +index aa5c997..45bee52 100644 --- a/src/filesystem/dpathbuf.h +++ b/src/filesystem/dpathbuf.h @@ -26,7 +26,10 @@ DCORE_BEGIN_NAMESPACE @@ -12,8 +12,8 @@ index 3aa7609..85df90d 100644 + m_path = QDir(path).absolutePath(); + } - DPathBuf operator/(const QString &p) const - { + /*! + * \brief join path with operator / diff --git a/src/filesystem/filesystem.pri b/src/filesystem/filesystem.pri index c8d81a0..e561867 100644 --- a/src/filesystem/filesystem.pri diff --git a/sources b/sources index 1816cb8..a646a63 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dtkcore-2.0.9.tar.gz) = cb0dddeaabdce4004e4049ae2143458c031708f091d98046e6517d92edd003f7b6d4e8a96252be060d49246659b405c183129193a746e9001612cae0b41bc5a9 +SHA512 (dtkcore-2.0.9.8.tar.gz) = ba893bc9db7e6178652e6d1b5833fc35ced761988c56c960c1df256638d11af2576a02bd2351ea3dc6876c2c5fc5045ad07fc293bfb2e1f99e35d41b17281b98