diff --git a/dtkcore-5.2.2.3.orig.tar.xz b/dtkcore-5.2.2.3.orig.tar.xz deleted file mode 100644 index db3658d57aca268cd9d0ac603c462c4972b3f800..0000000000000000000000000000000000000000 Binary files a/dtkcore-5.2.2.3.orig.tar.xz and /dev/null differ diff --git a/dtkcore.spec b/dtkcore.spec index a5bf208cc652c8c58415e8bfc3aa399d4d4d5459..d2e8685cfeb3db3f429533023a2f5b831c234198 100644 --- a/dtkcore.spec +++ b/dtkcore.spec @@ -1,18 +1,26 @@ Name: dtkcore -Version: 5.2.2.3 +Version: 5.4.11.2 Release: 2 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}.orig.tar.xz +%endif BuildRequires: gcc-c++ BuildRequires: annobin BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(gsettings-qt) +BuildRequires: gtest-devel + +# since f30 Obsoletes: deepin-tool-kit <= 0.3.3 Obsoletes: deepin-tool-kit-devel <= 0.3.3 Obsoletes: dtksettings <= 0.1.7 Obsoletes: dtksettings-devel <= 0.1.7 +Obsoletes: dtkcore2 %description Deepin tool kit core modules. @@ -20,16 +28,16 @@ Deepin tool kit core modules. %package devel Summary: Development package for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: qt5-qtbase-devel +Requires: qt5-qtbase-devel%{?_isa} %description devel Header files and libraries for %{name}. %prep -%setup -q +%autosetup -p1 -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,16 +49,16 @@ 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.5* +%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 +%{_datadir}/glib-2.0/schemas/* %files devel %doc doc/Specification.md @@ -62,10 +70,15 @@ export PATH=%{_qt5_bindir}:$PATH %{_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 28 2022 liweiganga - 5.4.11.2-2 +- fix install conflict + +* Tue Jul 19 2022 konglidong - 5.4.11.2-1 +- Update to 5.4.11.2 + * Thu Jul 15 2021 weidong - 5.2.2.3-2 - Format specfile. diff --git a/dtkcore_5.4.11.2.orig.tar.xz b/dtkcore_5.4.11.2.orig.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..e84351daac521ea3e48bf213b2a16b8982fd35bc Binary files /dev/null and b/dtkcore_5.4.11.2.orig.tar.xz differ