diff --git a/.gitignore b/.gitignore index ba5e78e..3dbc105 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /dtkcore-2.0.9.8.tar.gz /dtkcore-2.0.9.9.tar.gz /dtkcore-2.0.9.11.tar.gz +/dtkcore-2.0.9.15.tar.gz diff --git a/dtkcore.spec b/dtkcore.spec index 6c90b01..0b9979b 100644 --- a/dtkcore.spec +++ b/dtkcore.spec @@ -1,12 +1,12 @@ Name: dtkcore -Version: 2.0.9.11 -Release: 3%{?dist} +Version: 2.0.9.15 +Release: 1%{?dist} Summary: Deepin tool kit core modules License: GPLv3 URL: https://github.com/linuxdeepin/dtkcore Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz -Patch0: fix-symbol.patch BuildRequires: gcc-c++ +BuildRequires: annobin BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(gsettings-qt) @@ -23,12 +23,11 @@ Header files and libraries for %{name}. %prep %setup -q -%patch0 -p1 -b .fix_symbol sed -i 's|/lib|/libexec|' tools/settings/settings.pro ## consider relying on %%_qt5_bindir (see %%build below) instead of patching -- rex -sed -i 's|qmake|qmake-qt5|' src/dtk_module.prf -sed -i 's|lrelease|lrelease-qt5|' tools/script/dtk-translate.py src/dtk_translation.prf +#sed -i 's|qmake|qmake-qt5|' src/dtk_module.prf +#sed -i 's|lrelease|lrelease-qt5|' tools/script/dtk-translate.py src/dtk_translation.prf %build # help find (and prefer) qt5 utilities, e.g. qmake, lrelease @@ -66,6 +65,9 @@ export PATH=%{_qt5_bindir}:$PATH %{_libdir}/libdtkcore.so %changelog +* Thu Jan 31 2019 mosquito - 2.0.9.15-1 +- Update to 2.0.9.15 + * Thu Jan 31 2019 Fedora Release Engineering - 2.0.9.11-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/fix-symbol.patch b/fix-symbol.patch deleted file mode 100644 index a7b09b3..0000000 --- a/fix-symbol.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/src/filesystem/dpathbuf.h b/src/filesystem/dpathbuf.h -index aa5c997..45bee52 100644 ---- a/src/filesystem/dpathbuf.h -+++ b/src/filesystem/dpathbuf.h -@@ -26,7 +26,10 @@ DCORE_BEGIN_NAMESPACE - class LIBDTKCORESHARED_EXPORT DPathBuf - { - public: -- DPathBuf(const QString &path); -+ DPathBuf(const QString &path) -+ { -+ m_path = QDir(path).absolutePath(); -+ } - - /*! - * \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 -+++ b/src/filesystem/filesystem.pri -@@ -14,8 +14,7 @@ SOURCES += \ - $$PWD/dbasefilewatcher.cpp \ - $$PWD/dfilewatcher.cpp \ - $$PWD/dfilewatchermanager.cpp \ -- $$PWD/dstandardpaths.cpp \ -- $$PWD/dpathbuf.cpp -+ $$PWD/dstandardpaths.cpp - - linux { - SOURCES += \ diff --git a/sources b/sources index 7fbe3d8..34613c5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dtkcore-2.0.9.11.tar.gz) = c6ea3b1e9b2cb87de498c8a24110908a2eabf541dd2359fc5575a2abe846b31c50f6bffd64a5cc4f2d28ee32528a11f63ce97b2a9aecf022b2fe047e4d37ee15 +SHA512 (dtkcore-2.0.9.15.tar.gz) = d255def3ddb86830b8305591bce4b748c4cf1b189814c6339aae3b8ea87167f1475eb9fea41853d0e652bf3df53d618c8656bd6deb2406eec4fc5de78451b773