Release 4.6.7

.gitignore

@@ -2,3 +2,4 @@
 /dde-dock-4.5.7.1.tar.gz
 /dde-dock-4.5.9.tar.gz
 /dde-dock-4.5.12.tar.gz
+/dde-dock-4.6.7.tar.gz

deepin-dock.spec

@@ -1,15 +1,17 @@
 %global repo dde-dock
 
 Name:           deepin-dock
-Version:        4.5.12
-Release:        2%{?dist}
+Version:        4.6.7
+Release:        1%{?dist}
 Summary:        Deepin desktop-environment - Dock module
 License:        GPLv3
 URL:            https://github.com/linuxdeepin/dde-dock
 Source0:        %{url}/archive/%{version}/%{repo}-%{version}.tar.gz
 
-BuildRequires:  pkgconfig(dtkwidget) = 2.0
-BuildRequires:  pkgconfig(dframeworkdbus)
+BuildRequires:  cmake
+BuildRequires:  pkgconfig(dde-network-utils)
+BuildRequires:  pkgconfig(dtkwidget) >= 2.0.6
+BuildRequires:  pkgconfig(dframeworkdbus) >= 2.0
 BuildRequires:  pkgconfig(gsettings-qt)
 BuildRequires:  pkgconfig(gtk+-2.0)
 BuildRequires:  pkgconfig(Qt5Core)
@@ -42,12 +44,13 @@ Header files and libraries for %{name}.
 
 %prep
 %setup -q -n %{repo}-%{version}
-sed -i 's|lrelease|lrelease-qt5|g' translate_generation.sh
-sed -i '/target.path/s|lib|%{_lib}|' plugins/*/*.pro
-sed -i 's|lib|%{_lib}|' frame/controller/dockpluginloader.cpp
+sed -i 's|lrelease|lrelease-qt5|' translate_generation.sh
+sed -i '/TARGETS/s|lib|%{_lib}|' plugins/*/CMakeLists.txt
+sed -i 's|/lib|/%{_lib}|' frame/controller/dockpluginloader.cpp
+sed -i -E '35d;/dpkg-architecture|EXIT/d' CMakeLists.txt
 
 %build
-%qmake_qt5 PREFIX=%{_prefix}
+%cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} -DARCHITECTURE=%{_arch} .
 %make_build
 
 %install
@@ -59,6 +62,7 @@ sed -i 's|lib|%{_lib}|' frame/controller/dockpluginloader.cpp
 
 %files
 %license LICENSE
+%{_sysconfdir}/%{repo}/indicator/keybord_layout.json
 %{_bindir}/%{repo}
 %{_libdir}/%{repo}/
 %{_datadir}/%{repo}/
@@ -68,6 +72,9 @@ sed -i 's|lib|%{_lib}|' frame/controller/dockpluginloader.cpp
 %{_includedir}/%{repo}/
 
 %changelog
+* Fri Jul 27 2018 mosquito <sensor.wen@gmail.com> - 4.6.7-1
+- Update to 4.6.7
+
 * Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.5.12-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 

sources

@@ -1 +1 @@
-SHA512 (dde-dock-4.5.12.tar.gz) = a5c33277280ff0cbcedbe86d3b51fb0986e277c8298f57bca9bcf6e713404be4e86911974b8c1208081d11963aa38d2d743c863a8694b0c552dd9966f9495844
+SHA512 (dde-dock-4.6.7.tar.gz) = 8cb87318daae588972015fc6554e3125a1390384393e0dc07dd05f1d8c05352a8bb84c07db672d35c985676cb8938a17983c9b35e9ba47543d5f7f5bcd336eab