diff --git a/dde-dock-5.4.12.7.orig.tar.xz b/dde-dock-5.4.12.7.orig.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..3a5265a4dfe97f652b302c2927b841b853ad5dc5 Binary files /dev/null and b/dde-dock-5.4.12.7.orig.tar.xz differ diff --git a/dde-dock.spec b/dde-dock.spec old mode 100755 new mode 100644 index 52f9ab302f8216b16a62c5d40368b00c6860ad8f..59141395d4c888a9ec845823554c015172efb2e9 --- a/dde-dock.spec +++ b/dde-dock.spec @@ -1,12 +1,12 @@ %global sname deepin-dock Name: dde-dock -Version: 5.3.0.31 -Release: 2 +Version: 5.4.12.7 +Release: 1 Summary: Deepin desktop-environment - Dock module License: GPLv3 URL: http://shuttle.corp.deepin.com/cache/repos/eagle/release-candidate/RERFNS4wLjAuNjU3NQ/pool/main/d/dde-dock/ -Source0: %{name}_%{version}.orig.tar.xz +Source0: %{name}-%{version}.orig.tar.xz BuildRequires: cmake BuildRequires: gcc-c++ @@ -30,13 +30,17 @@ BuildRequires: pkgconfig(xcb-ewmh) BuildRequires: pkgconfig(xcb-icccm) BuildRequires: pkgconfig(xcb-image) BuildRequires: qt5-linguist +BuildRequires: gtest-devel +BuildRequires: gmock-devel BuildRequires: qt5-qtbase-private-devel + Requires: dbusmenu-qt5 Requires: dde-network-utils Requires: dde-qt-dbus-factory Requires: xcb-util-wm Requires: xcb-util-image Requires: libxcb +Requires: onboard %description Deepin desktop-environment - Dock module. @@ -60,18 +64,20 @@ deepin desktop-environment - dock plugin. sed -i '/TARGETS/s|lib|%{_lib}|' plugins/*/CMakeLists.txt \ plugins/plugin-guide/plugins-developer-guide.md -sed -i -E '30,39d' CMakeLists.txt +sed -i -E '32,39d' CMakeLists.txt sed -i 's|/lib|/%{_lib}|' frame/controller/dockpluginscontroller.cpp \ - frame/panel/mainpanelcontrol.cpp \ plugins/tray/system-trays/systemtrayscontroller.cpp -sed -i 's|/lib|/libexec|g' plugins/show-desktop/showdesktopplugin.cpp +sed -i 's|/lib|/libexec|g' plugins/show-desktop/showdesktopplugin.cpp \ + frame/window/mainpanelcontrol.cpp sed -i 's|/usr/lib/dde-dock/plugins|%{_libdir}/dde-dock/plugins|' plugins/plugin-guide/plugins-developer-guide.md sed -i 's|local/lib/dde-dock/plugins|local/%{_lib}/dde-dock/plugins|' plugins/plugin-guide/plugins-developer-guide.md +sed -i 's|lrelease|lrelease-qt5|' translate_generation.sh + %build export PATH=%{_qt5_bindir}:$PATH %cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} -DARCHITECTURE=%{_arch} . @@ -83,12 +89,10 @@ export PATH=%{_qt5_bindir}:$PATH %ldconfig_scriptlets %files +%{_datadir}/%{name}/translations/*.qm %license LICENSE -%{_sysconfdir}/%{name}/indicator/keybord_layout.json %{_bindir}/%{name} %{_libdir}/%{name}/ -%{_datadir}/%{name}/ -%{_datadir}/dbus-1/services/*.service %{_datarootdir}/glib-2.0/schemas/com.deepin.dde.dock.module.gschema.xml %{_datarootdir}/polkit-1/actions/com.deepin.dde.dock.overlay.policy @@ -102,6 +106,9 @@ export PATH=%{_qt5_bindir}:$PATH %changelog +* Mon Jul 18 2022 konglidong - 5.4.12.7-1 +- Update to 5.4.12.7 + * Fri Jun 17 2022 loong_C - 5.3.0.31-2 - fix build error @@ -113,3 +120,4 @@ export PATH=%{_qt5_bindir}:$PATH * Thu Jul 30 2020 openEuler Buildteam - 5.1.0.13-1 - Package init + diff --git a/dde-dock_5.3.0.31.orig.tar.xz b/dde-dock_5.3.0.31.orig.tar.xz deleted file mode 100644 index fcb6da1f5357e85738374aa170bcfa25dbe8f1bf..0000000000000000000000000000000000000000 Binary files a/dde-dock_5.3.0.31.orig.tar.xz and /dev/null differ