diff --git a/dtkcore.spec b/dtkcore.spec index 3cdb779..898233a 100644 --- a/dtkcore.spec +++ b/dtkcore.spec @@ -1,6 +1,6 @@ Name: dtkcore Version: 2.0.9.11 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Deepin tool kit core modules License: GPLv3 URL: https://github.com/linuxdeepin/dtkcore @@ -24,11 +24,15 @@ Header files and libraries for %{name}. %prep %setup -q %patch0 -p1 -b .fix_symbol -sed -i 's|qmake|qmake-qt5|' src/dtk_module.prf + 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 %build +# help find (and prefer) qt5 utilities, e.g. qmake, lrelease +export PATH=%{_qt5_bindir}:$PATH %qmake_qt5 PREFIX=%{_prefix} \ DTK_VERSION=%{version} \ LIB_INSTALL_DIR=%{_libdir} \ @@ -39,14 +43,12 @@ sed -i 's|lrelease|lrelease-qt5|' tools/script/dtk-translate.py src/dtk_translat %install %make_install INSTALL_ROOT=%{buildroot} -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig +%ldconfig_scriptlets %files %doc README.md %license LICENSE -%{_libdir}/lib*.so.* +%{_libdir}/libdtkcore.so.2* %{_libexecdir}/dtk2/dtk-settings %{_libexecdir}/dtk2/dtk-license.py* %{_libexecdir}/dtk2/dtk-translate.py* @@ -57,13 +59,18 @@ sed -i 's|lrelease|lrelease-qt5|' tools/script/dtk-translate.py src/dtk_translat %{_includedir}/libdtk-*/ %{_qt5_archdatadir}/mkspecs/features/*.prf %{_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 +%{_libdir}/cmake/Dtk/ +%{_libdir}/cmake/DtkCore/ +%{_libdir}/cmake/DtkCMake/ +%{_libdir}/pkgconfig/dtkcore.pc +%{_libdir}/libdtkcore.so %changelog +* Tue Jan 01 2019 Rex Dieter - 2.0.9.11-2 +- use %%_qt5_bindir, %%ldconfig-scriptlets +- -devel: own %%{_libdir}/cmake/Dtk* dirs +- %%files: less globs, explicitly list items related to ABI/API + * Wed Dec 12 2018 mosquito - 2.0.9.11-1 - Update to 2.0.9.11