diff --git a/deepin-editor-5.9.23.tar.gz b/deepin-editor-5.9.23.tar.gz new file mode 100644 index 0000000..f606279 Binary files /dev/null and b/deepin-editor-5.9.23.tar.gz differ diff --git a/deepin-editor.spec b/deepin-editor.spec index 29114ac..f21b672 100644 --- a/deepin-editor.spec +++ b/deepin-editor.spec @@ -1,32 +1,43 @@ +%global debug_package %{nil} + Name: deepin-editor -Version: 5.6.1 -Release: 4 +Version: 5.9.23 +Release: 1%{?dist}.01 Summary: Simple editor for Linux Deepin License: GPLv3 URL: https://github.com/linuxdeepin/deepin-editor -Source0: %{name}_%{version}.orig.tar.xz +Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz -BuildRequires: gcc-c++ -BuildRequires: freeimage-devel -BuildRequires: cmake(KF5Codecs) -BuildRequires: cmake(KF5SyntaxHighlighting) -BuildRequires: dtkcore-devel -BuildRequires: dtkwidget-devel -BuildRequires: pkgconfig(libexif) -BuildRequires: pkgconfig(xcb-aux) -BuildRequires: pkgconfig(xtst) -BuildRequires: pkgconfig(polkit-qt5-1) -BuildRequires: pkgconfig(Qt5) -BuildRequires: pkgconfig(Qt5DBus) -BuildRequires: pkgconfig(Qt5Gui) -BuildRequires: pkgconfig(Qt5Svg) -BuildRequires: pkgconfig(Qt5X11Extras) -BuildRequires: qt5-linguist -BuildRequires: qt5-qtbase-private-devel -BuildRequires: cmake -%{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}} -Requires: deepin-notifications -Requires: dde-qt5integration +%if 0%{?openeuler} +BuildRequires: cmake +%else +BuildRequires: cmake3 +%endif + +BuildRequires: qt5-devel +BuildRequires: gcc-c++ +BuildRequires: freeimage-devel +BuildRequires: pkgconfig(dtkwidget) +BuildRequires: pkgconfig(dtkcore) +BuildRequires: pkgconfig(libexif) +BuildRequires: pkgconfig(xcb-aux) +BuildRequires: pkgconfig(xtst) +BuildRequires: pkgconfig(polkit-qt5-1) +BuildRequires: pkgconfig(Qt5) +BuildRequires: pkgconfig(Qt5DBus) +BuildRequires: pkgconfig(Qt5Gui) +BuildRequires: pkgconfig(Qt5Svg) +BuildRequires: pkgconfig(Qt5X11Extras) +BuildRequires: pkgconfig(dframeworkdbus) +BuildRequires: qt5-linguist +BuildRequires: qt5-qtbase-private-devel +BuildRequires: kf5-kcodecs-devel +BuildRequires: kf5-syntax-highlighting-devel +BuildRequires: gtest-devel +BuildRequires: gmock-devel +BuildRequires: uchardet-devel +BuildRequires: enca-devel +BuildRequires: dtkcommon-devel %description %{summary}. @@ -35,27 +46,31 @@ Requires: dde-qt5integration %setup -q %build +# help find (and prefer) qt5 utilities, e.g. qmake, lrelease export PATH=%{_qt5_bindir}:$PATH -%cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} -DCMAKE_BUILD_TYPE=Release . +# 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" -%check -desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop ||: +# %check +# desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop ||: %files %doc README.md %license LICENSE -%{_bindir}/dedit +# %{_bindir}/dedit %{_bindir}/%{name} %{_datadir}/%{name}/ %{_datadir}/applications/%{name}.desktop +%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg +%{_datadir}/deepin-manual/manual-assets/application/deepin-editor/editor/* %changelog -* Fri Aug 28 2020 chenbo pan - 5.6.1-4 -- fix compile fail - -* Thu Jul 30 2020 openEuler Buildteam - 5.6.1-3 -- Package init +* Mon Jun 13 2022 uoser - 5.9.23-1.01 +- update to 5.9.23-1.01 diff --git a/deepin-editor_5.6.1.orig.tar.xz b/deepin-editor_5.6.1.orig.tar.xz deleted file mode 100644 index eb990ed..0000000 Binary files a/deepin-editor_5.6.1.orig.tar.xz and /dev/null differ