diff --git a/dtkcore-5.5.19.tar.gz b/dtkcore-5.5.19.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..ed9efc7f1056fbb60a2a46ac71c468cb67e6c366 Binary files /dev/null and b/dtkcore-5.5.19.tar.gz differ diff --git a/dtkcore.spec b/dtkcore.spec index 90142af58444275d0fd35cf30305c78234da7be6..a9aacb12b9754f288ac20b149b87eb0b6b41abcc 100644 --- a/dtkcore.spec +++ b/dtkcore.spec @@ -1,14 +1,25 @@ Name: dtkcore -Version: 5.2.1 -Release: 1 +Version: 5.5.19 +Release: 1%{?dist}.02 Summary: Deepin tool kit core modules -License: GPLv3 +License: LGPLv3+ URL: https://github.com/linuxdeepin/dtkcore -Source0: %{name}_%{version}.orig.tar.xz +%if 0%{?fedora} +Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz +%else +Source0: %{name}-%{version}.tar.gz +%endif BuildRequires: gcc-c++ BuildRequires: annobin BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(gsettings-qt) +BuildRequires: gtest-devel +BuildRequires: qt5-qttools-devel +BuildRequires: dtkcommon-devel +BuildRequires: qt5-qtbase-private-devel + + +# since f30 Obsoletes: deepin-tool-kit <= 0.3.3 Obsoletes: deepin-tool-kit-devel <= 0.3.3 Obsoletes: dtksettings <= 0.1.7 @@ -20,16 +31,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 -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 +53,28 @@ 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-translate.py* +%{_libexecdir}/dtk5/dtk-license.py +%{_libexecdir}/dtk5/dtk-translate.py %{_libexecdir}/dtk5/deepin-os-release +%{_bindir}/* %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 -/usr/share/glib-2.0/schemas/* +%{_libdir}/lib%{name}.so %changelog -* Thu Jul 30 2020 openEuler Buildteam - 5.2.1-1 -- Package init +* Mon Jun 13 2022 uoser - 5.5.19-1.02 +- update: update to 5.5.19-1.02 + diff --git a/dtkcore_5.2.1.orig.tar.xz b/dtkcore_5.2.1.orig.tar.xz deleted file mode 100755 index 96520b085cc42e677bd93fdf79959de44f1037f1..0000000000000000000000000000000000000000 Binary files a/dtkcore_5.2.1.orig.tar.xz and /dev/null differ