diff --git a/0001-remove-common-collactor.patch b/0001-remove-common-collactor.patch new file mode 100644 index 0000000000000000000000000000000000000000..3876ef72ed24e79b72977829e40907f8b01f5fa4 --- /dev/null +++ b/0001-remove-common-collactor.patch @@ -0,0 +1,40 @@ +diff --git a/application/CMakeLists.txt b/application/CMakeLists.txt +index 5617921..1808a67 100755 +--- a/application/CMakeLists.txt ++++ b/application/CMakeLists.txt +@@ -168,7 +168,6 @@ set (APP_CPP_FILES + lognormalbutton.cpp + logapplication.cpp + sharedmemorymanager.cpp +- common/collator.cpp + dbusproxy/dldbusinterface.cpp + dbusproxy/dldbushandler.cpp + logsettings.cpp +@@ -204,7 +203,6 @@ set (APP_HEADERS_FILES + logdetailedit.h + wtmpparse.h + model/log_sort_filter_proxy_model.h +- common/collator.h + dbusproxy/dldbusinterface.h + dbusproxy/dldbushandler.h + ) +diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt +index 6e80630..9c598b3 100755 +--- a/tests/CMakeLists.txt ++++ b/tests/CMakeLists.txt +@@ -100,7 +100,6 @@ FILE(GLOB allSource + ../application/logsearchedit.cpp + ../application/logapplication.cpp + ../application/sharedmemorymanager.cpp +- ../application/common/collator.cpp + ../application/logsettings.cpp + ../application/wtmpparse.cpp + ../application/DebugTimeManager.cpp +@@ -179,7 +178,6 @@ include_directories(${GTEST_INCLUDE_DIRS}) + + FILE(GLOB allTestSource + src/*.cpp +-common/*.cpp + dbusproxy/*.cpp + ) + include_directories(src) diff --git a/deepin-log-viewer-5.6.1.orig.tar.xz b/deepin-log-viewer-5.6.1.orig.tar.xz deleted file mode 100644 index e1a6a7ac380bd8df23c10e8c26d8df80ed6523f9..0000000000000000000000000000000000000000 Binary files a/deepin-log-viewer-5.6.1.orig.tar.xz and /dev/null differ diff --git a/deepin-log-viewer-5.8.34.tar.gz b/deepin-log-viewer-5.8.34.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..7b61def5d48d54de69c3b6e0245ac8b3be589ba5 Binary files /dev/null and b/deepin-log-viewer-5.8.34.tar.gz differ diff --git a/deepin-log-viewer.spec b/deepin-log-viewer.spec index 242dffcc50cfaf47b0d29b44a8fd19e641655f7c..d28073a0f94c8ef04084c3b873204318990610ac 100644 --- a/deepin-log-viewer.spec +++ b/deepin-log-viewer.spec @@ -1,60 +1,86 @@ -%bcond_with check - -%global with_debug 1 -%if 0%{?with_debug} -%global debug_package %{nil} -%endif -Name: deepin-log-viewer -Version: 5.6.1 -Release: 2 -Summary: Log Viewer is a useful tool for viewing system logs. +Name: deepin-log-viewer +Version: 5.8.34 +Release: 1%{?dist}.01 +Summary: Log Viewer is a useful tool for viewing system logs License: GPLv3+ -URL: https://uos-packages.deepin.com/uos/pool/main/d/deepin-log-viewer/ -Source0: %{name}-%{version}.orig.tar.xz +URL: https://github.com/linuxdeepin/%{name} +Source0: %{name}-%{version}.tar.gz +#uelc patch +Patch0001: 0001-remove-common-collactor.patch - -BuildRequires: qt5-qtbase-devel -BuildRequires: dtkcore-devel +BuildRequires: qt5-devel +BuildRequires: gcc-c++ +BuildRequires: cmake3 BuildRequires: dtkwidget-devel BuildRequires: dtkgui-devel -BuildRequires: deepin-gettext-tools -BuildRequires: qt5-linguist -BuildRequires: qt5-qtmultimedia-devel -BuildRequires: qt5-qtx11extras-devel BuildRequires: systemd-devel +BuildRequires: libicu-devel +BuildRequires: qt5-rpm-macros +BuildRequires: qt5-qtbase-devel +BuildRequires: qt5-qttools-devel +BuildRequires: pkgconfig(dframeworkdbus) +BuildRequires: gtest-devel +BuildRequires: gmock-devel +BuildRequires: kf5-kcodecs-devel +BuildRequires: libzip-devel +BuildRequires: xerces-c-devel +BuildRequires: boost-devel + +%if 0%{?openeuler} +BuildRequires: minizip-devel +%else +BuildRequires: minizip1.2-devel +%endif + +BuildRequires: rapidjson-devel +BuildRequires: libtool-ltdl-devel +BuildRequires: fftw-libs +BuildRequires: dtkcommon-devel +BuildRequires: qt5-qtbase-private-devel +BuildRequires: qt5-qtsvg-devel +BuildRequires: zlib-devel %description Log Viewer is a useful tool for viewing system logs. - %prep -%autosetup +%if 0%{?openeuler} +%setup -q +%else +%autosetup -p1 +%endif %build -export PATH=$PATH:/usr/lib64/qt5/bin -mkdir build && cd build -%{_libdir}/qt5/bin/qmake .. -%{__make} +export PATH=%{_qt5_bindir}:$PATH +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 -pushd %{_builddir}/%{name}-%{version}/build -%make_install INSTALL_ROOT=%{buildroot} -popd +%make_install -C build INSTALL_ROOT="%buildroot" + %files -%{_bindir}/deepin-log-viewer -%{_bindir}/logViewerAuth -%{_datadir}/applications/deepin-log-viewer.desktop -%{_datadir}/deepin-log-viewer/translations/deepin-log-viewer.qm -%{_datadir}/deepin-log-viewer/translations/deepin-log-viewer_zh_CN.qm -%{_datadir}/icons/hicolor/scalable/apps/deepin-log-viewer.svg -%{_datadir}/polkit-1/actions/com.deepin.pkexec.logViewerAuth.policy %doc README.md +%license LICENSE +%{_bindir}/%{name} +%{_bindir}/logViewerAuth +%{_bindir}/logViewerTruncate +%{_datadir}/applications/%{name}.desktop +%{_datadir}/%{name}/translations/*.qm +%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg +%{_datadir}/polkit-1/actions/*.policy +%{_datadir}/deepin-manual/manual-assets/application/deepin-log-viewer/log-viewer/* +/usr/lib/deepin-daemon/logViewerService +/usr/share/dbus-1/system-services/com.deepin.logviewer.service +/usr/share/dbus-1/system.d/com.deepin.logviewer.conf +%{_datadir}/%{name}/DocxTemplate/*.dfw + %changelog -* Fri Aug 28 2020 chenbo pan - 5.0.10-2 -- fix compile fail +* Mon Jun 13 2022 uoser - 5.8.34-1.01 +- update: update to 5.8.34-1.01 -* Thu Jul 30 2020 openEuler Buildteam - 5.6.1-1 -- Package init