diff --git a/deepin-manual-5.6.7.tar.gz b/deepin-manual-5.6.42.tar.gz similarity index 32% rename from deepin-manual-5.6.7.tar.gz rename to deepin-manual-5.6.42.tar.gz index 22453ff931167c6e8768fc3e58a0e74927578d74..6cf97257d192dc5f66ea3c00fec56e6c8c9e1200 100644 Binary files a/deepin-manual-5.6.7.tar.gz and b/deepin-manual-5.6.42.tar.gz differ diff --git a/deepin-manual.spec b/deepin-manual.spec index 7e4869c7ca25f84f6e51541738e93bd73699329e..e090d1aacc1878ca52db54688ba72a5d40d6d1e6 100644 --- a/deepin-manual.spec +++ b/deepin-manual.spec @@ -1,61 +1,69 @@ -%bcond_with check -%global debug_package %{nil} -%global _unpackaged_files_terminate_build 0 -Name: deepin-manual -Version: 5.6.7 -Release: 6 -Summary: Manual is designed to help users learn the operating system and its applications, providing specific instructions and function descriptions. -License: GPLv3 -URL: https://uos-packages.deepin.com/uos/pool/main/d/deepin-manual/ -Source0: https://github.com/linuxdeepin/%{name}/archive/%{version}/%{name}-%{version}.tar.gz +Name: deepin-manual +Version: 5.6.42 +Release: 1 +Summary: Manual is designed to help users learn the operating system and its applications, providing specific instructions and function descriptions +License: GPLv3+ +URL: https://github.com/linuxdeepin/%{name} +Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz + +BuildRequires: gcc-c++ BuildRequires: cmake +BuildRequires: qt5-devel + BuildRequires: dtkcore-devel BuildRequires: dtkwidget-devel -BuildRequires: dtkgui-devel -BuildRequires: qt5-qtx11extras-devel -BuildRequires: qt5-linguist -BuildRequires: qt5-qtwebchannel -BuildRequires: qt5-qtwebchannel-devel +BuildRequires: pkgconfig(dtkgui) BuildRequires: qt5-qtwebengine-devel -BuildRequires: qt5-qtwebengine -Requires: qt5-qtwebengine +BuildRequires: qt5-qtwebchannel-devel +BuildRequires: qt5-linguist +BuildRequires: qt5-qtx11extras-devel + %description -Manual is designed to help users learn the operating system and its applications, providing specific instructions and function descriptions. +%{Summary}. %prep -%setup +%autosetup -c -n %{name}-%{version} %build -export PATH=$PATH:/usr/lib64/qt5/bin -%cmake +# help find (and prefer) qt5 utilities, e.g. qmake, lrelease +export PATH=%{_qt5_bindir}:$PATH +# cmake_minimum_required version is too high +sed -i "s|^cmake_minimum_required.*|cmake_minimum_required(VERSION 3.0)|" $(find . -name "CMakeLists.txt") +mkdir build && pushd build +%cmake -DCMAKE_BUILD_TYPE=Release ../ -DAPP_VERSION=%{version} -DVERSION=%{version} %make_build +popd %install -%make_install INSTALL_ROOT=%{buildroot} +%make_install -C build INSTALL_ROOT="%buildroot" %files -/usr/bin/dman -/usr/bin/dman-search -/usr/share/applications/deepin-manual.desktop -/usr/share/dbus-1/services/com.deepin.Manual.Open.service -/usr/share/dbus-1/services/com.deepin.Manual.Search.service -/usr/share/deepin-manual/dman -/usr/share/deepin-manual/web_dist/index.css -/usr/share/deepin-manual/web_dist/index.html -/usr/share/deepin-manual/web_dist/index.js -/usr/share/deepin-manual/web_dist/qwebchannel.js -/usr/share/icons/hicolor/scalable/apps/deepin-manual.svg -%exclude /usr/share/deepin-manual/manual-assets/professional/* -/usr/share/deepin-manual/translations/* -/usr/share/deepin-manual/manual-assets/server/* -%license LICENSE +%{_bindir}/dman +%{_bindir}/dman-search +%{_datadir}/applications/deepin-manual.desktop +%{_datadir}/dbus-1/services/com.deepin.Manual.Open.service +%{_datadir}/dbus-1/services/com.deepin.Manual.Search.service +%{_datadir}/deepin-manual/dman +%{_datadir}/deepin-manual/web_dist/index.css +%{_datadir}/deepin-manual/web_dist/index.html +%{_datadir}/deepin-manual/web_dist/index.js +%{_datadir}/deepin-manual/web_dist/qwebchannel.js +%{_datadir}/icons/hicolor/scalable/apps/deepin-manual.svg +%{_datadir}/%{name}/manual-assets/deepin-manual.svg +%{_datadir}/deepin-manual/manual-assets/professional/* +%{_datadir}/%{name}/translations/*.qm +%{_datadir}/deepin-manual/manual-assets/server/* %doc README.md +%license LICENSE %changelog +* Mon Jul 12 2021 weidong - 5.6.42-1 +- Update 5.6.42 + * Thu Sep 3 2020 weidong - 5.6.7-6 - fix source url in spec