diff --git a/.gitignore b/.gitignore index 3ea5ad8..fad0202 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ /dde-dock-5.3.0.13.tar.gz /dde-dock-5.3.0.21.tar.gz /dde-dock-5.3.64.tar.gz +/dde-dock-5.4.39.tar.gz diff --git a/deepin-dock.spec b/deepin-dock.spec index 50126dd..ee66bde 100644 --- a/deepin-dock.spec +++ b/deepin-dock.spec @@ -2,23 +2,14 @@ %global repo dde-dock %global __provides_exclude_from ^%{_libdir}/%{repo}/.*\\.so$ -%if 0%{?fedora} %global start_logo start-here Name: %{sname} -%else -Name: %{repo} -%endif -Version: 5.3.64 +Version: 5.4.39 Release: %autorelease Summary: Deepin desktop-environment - Dock module License: GPLv3 -%if 0%{?fedora} URL: https://github.com/linuxdeepin/dde-dock Source0: %{url}/archive/%{version}/%{repo}-%{version}.tar.gz -%else -URL: http://shuttle.corp.deepin.com/cache/repos/eagle/release-candidate/RERFNS4wLjAuNjU3NQ/pool/main/d/dde-dock/ -Source0: %{name}_%{version}.orig.tar.xz -%endif BuildRequires: cmake BuildRequires: gcc-c++ @@ -44,6 +35,7 @@ BuildRequires: pkgconfig(xcb-icccm) BuildRequires: pkgconfig(xcb-image) BuildRequires: qt5-linguist BuildRequires: gtest-devel +BuildRequires: gmock-devel Requires: dbusmenu-qt5 %if 0%{?fedora} BuildRequires: qt5-qtbase-private-devel @@ -82,12 +74,12 @@ sed -i '/TARGETS/s|lib|%{_lib}|' plugins/*/CMakeLists.txt \ plugins/plugin-guide/plugins-developer-guide.md sed -i 's|/lib|/%{_lib}|' frame/controller/dockpluginscontroller.cpp \ - frame/panel/mainpanelcontrol.cpp \ + frame/window/mainpanelcontrol.cpp \ plugins/tray/system-trays/systemtrayscontroller.cpp sed -i 's|/lib|/libexec|g' plugins/show-desktop/showdesktopplugin.cpp \ - frame/panel/mainpanelcontrol.cpp + frame/window/mainpanelcontrol.cpp sed -i 's:libdir.*:libdir=%{_libdir}:' dde-dock.pc.in diff --git a/sources b/sources index e019392..c325dc4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dde-dock-5.3.64.tar.gz) = 9d52cb8d01b99c4e7596798f65ceb66834807cf8a3dd4747bd323fa13ab9fb2d64030f6dd3eb85d53e3c8645353936169700c37a9ae7a87140a8f950c61604cb +SHA512 (dde-dock-5.4.39.tar.gz) = 8ba6fbc1cef5254389ec6824b60f4bed5a6be32a027aec1a414ea5268118b8b4935eda78da30b01494092bf6db34bf12c2fdb1e27eb845f749f24d51ac5529fc