diff --git a/deepin-clone-5.0.3.tar.gz b/deepin-clone-5.0.11.tar.gz similarity index 78% rename from deepin-clone-5.0.3.tar.gz rename to deepin-clone-5.0.11.tar.gz index 2d320d1..4097ebb 100644 Binary files a/deepin-clone-5.0.3.tar.gz and b/deepin-clone-5.0.11.tar.gz differ diff --git a/deepin-clone.spec b/deepin-clone.spec index b77fdeb..4ecb9d4 100644 --- a/deepin-clone.spec +++ b/deepin-clone.spec @@ -1,17 +1,29 @@ Name: deepin-clone -Version: 5.0.3 -Release: 2 +Version: 5.0.11 +Release: 1 Summary: Disk and partition backup/restore tool License: GPLv3 URL: https://github.com/linuxdeepin/deepin-clone Source0: https://github.com/linuxdeepin/%{name}/archive/%{version}/%{name}-%{version}.tar.gz -Patch0: modify-QPainterPath-error.patch -BuildRequires: gcc-c++ desktop-file-utils qt5-linguist qt5-qtbase-private-devel -BuildRequires: dtkwidget2-devel dtkcore2-devel deepin-gettext-tools dtkcore2 dtkwidget2 -BuildRequires: pkgconfig(polkit-qt5-1) pkgconfig(Qt5Core) pkgconfig(Qt5Concurrent) pkgconfig(Qt5Gui) pkgconfig(Qt5Widgets) +BuildRequires: gcc-c++ +BuildRequires: cmake +BuildRequires: desktop-file-utils +BuildRequires: qt5-linguist +BuildRequires: qt5-qtbase-devel +BuildRequires: qt5-qtbase-private-devel +BuildRequires: dtkwidget-devel +BuildRequires: dtkcore-devel +BuildRequires: dtkgui-devel +BuildRequires: deepin-gettext-tools +BuildRequires: dde-file-manager-devel + %{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}} -Requires: hicolor-icon-theme partclone +Requires: hicolor-icon-theme +Requires: partclone +Requires: jfsutils +Requires: ntfs-3g +Requires: xfsprogs ExclusiveArch: x86_64 %{ix86} aarch64 %description @@ -19,13 +31,15 @@ ExclusiveArch: x86_64 %{ix86} aarch64 %prep %autosetup -p1 -sed -i 's|/usr/sbin|/usr/bin|' app/{%{name}-app.pro,%{name}-ionice,%{name}-pkexec,com.deepin.pkexec.%{name}.policy.tmp} +sed -i 's|sbin|bin|' CMakeLists.txt +sed -i 's|Version=0.1|Version=%{version}|' app/%{name}.desktop +#sed -i 's|/usr/sbin|/usr/bin|' app/{%{name}-app.pro,%{name}-ionice,%{name}-pkexec,com.deepin.pkexec.%{name}.policy.tmp} %build export PATH=%{_qt5_bindir}:$PATH export CFLAGS="%{optflags} -Wno-error=format-security" export CXXFLAGS="%{optflags} -Wno-error=format-security" -%qmake_qt5 PREFIX=%{_prefix} +%cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} . %make_build %install @@ -39,12 +53,15 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop ||: %{_bindir}/%{name}* %{_datadir}/%{name}/ %{_datadir}/applications/%{name}.desktop -%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg %{_datadir}/icons/hicolor/scalable/mimetypes/*.svg %{_datadir}/mime/packages/%{name}.xml %{_datadir}/polkit-1/actions//com.deepin.pkexec.%{name}.policy +%{_libdir}/dde-file-manager/plugins/controllers/libdfm-plugin-dim-file.so %changelog +* Thu Jun 01 2023 leeffo - 5.0.11-1 +- update to 5.0.11 + * Thu Feb 10 2022 liweigang - 5.0.3-2 - fix build error diff --git a/modify-QPainterPath-error.patch b/modify-QPainterPath-error.patch deleted file mode 100644 index e4fbb84..0000000 --- a/modify-QPainterPath-error.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff --color -Naur a/app/src/widgets/iconlabel.cpp b/app/src/widgets/iconlabel.cpp ---- a/app/src/widgets/iconlabel.cpp 2022-02-07 15:19:33.851222835 +0800 -+++ b/app/src/widgets/iconlabel.cpp 2022-02-07 15:20:25.279867495 +0800 -@@ -24,6 +24,7 @@ - #include - #include - #include -+#include - - IconLabel::IconLabel(QWidget *parent, bool wordWrap) - : QWidget(parent)