diff --git a/dtkcore.spec b/dtkcore.spec index 78217d8..ef4f78c 100644 --- a/dtkcore.spec +++ b/dtkcore.spec @@ -1,10 +1,11 @@ Name: dtkcore Version: 2.0.9 -Release: 3%{?dist} +Release: 4%{?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: pkgconfig(Qt5Core) BuildRequires: pkgconfig(gsettings-qt) @@ -21,11 +22,10 @@ Header files and libraries for %{name}. %prep %setup -q -sed -i 's|tests|tool|' dtkcore.pro -sed -i 's|/lib|/libexec|' tools/settings/settings.pro -sed -i 's|lrelease|lrelease-qt5|g' src/dtk_translation.prf -sed -i 's|lrelease|lrelease-qt5|g' tools/script/dtk-translate.py +%patch0 -p1 -b .fix_symbol sed -i 's|qmake|qmake-qt5|' src/dtk_module.prf +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} @@ -49,14 +49,17 @@ sed -i 's|qmake|qmake-qt5|' src/dtk_module.prf %files devel %doc doc/Specification.md %{_includedir}/libdtk-*/ +%{_qt5_archdatadir}/mkspecs/features/*.prf +%{_qt5_archdatadir}/mkspecs/modules/*.pri %{_libdir}/cmake/Dtk/DtkConfig.cmake %{_libdir}/cmake/DtkCore/DtkCoreConfig.cmake %{_libdir}/pkgconfig/*.pc %{_libdir}/lib*.so -%{_libdir}/qt5/mkspecs/modules/qt_lib_dtkcore.pri -%{_libdir}/qt5/mkspecs/features/dtk*.prf %changelog +* Sat Aug 25 2018 mosquito - 2.0.9-4 +- Fix symbol + * Tue Jul 31 2018 Florian Weimer - 2.0.9-3 - Rebuild with fixed binutils diff --git a/fix-symbol.patch b/fix-symbol.patch new file mode 100644 index 0000000..4109bf8 --- /dev/null +++ b/fix-symbol.patch @@ -0,0 +1,30 @@ +diff --git a/src/filesystem/dpathbuf.h b/src/filesystem/dpathbuf.h +index 3aa7609..85df90d 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(); ++ } + + DPathBuf operator/(const QString &p) const + { +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 += \