diff --git a/.gitignore b/.gitignore index 0225c1f..1937819 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /dde-daemon-3.2.9.tar.gz /dde-daemon-3.2.21.tar.gz /dde-daemon-3.2.22.tar.gz +/dde-daemon-3.2.20.tar.gz diff --git a/deepin-daemon.spec b/deepin-daemon.spec index 16f86ef..e6efc6a 100644 --- a/deepin-daemon.spec +++ b/deepin-daemon.spec @@ -2,7 +2,7 @@ %global ds_url https://github.com/linuxdeepin/default-settings Name: deepin-daemon -Version: 3.2.22 +Version: 3.2.20 Release: 1%{?dist} Summary: Daemon handling the DDE session settings License: GPLv3 @@ -44,10 +44,10 @@ BuildRequires: pkgconfig(xtst) BuildRequires: pkgconfig(xcursor) BuildRequires: pkgconfig(xfixes) BuildRequires: pkgconfig(xkbfile) -BuildRequires: golang-deepin-dbus-factory-devel -BuildRequires: golang(pkg.deepin.io/lib) +BuildRequires: golang-deepin-dbus-factory-devel >= 3.1.16 +BuildRequires: golang(pkg.deepin.io/lib) >= 1.2.11 BuildRequires: golang(pkg.deepin.io/lib/fsnotify) -BuildRequires: golang(pkg.deepin.io/dde/api/dxinput) +BuildRequires: golang(pkg.deepin.io/dde/api/dxinput) >= 3.1.26 BuildRequires: golang(github.com/linuxdeepin/go-dbus-factory) BuildRequires: golang(github.com/linuxdeepin/go-x11-client) BuildRequires: golang(github.com/BurntSushi/xgb) @@ -99,6 +99,7 @@ sed -i '/systemd/s|lib|usr/lib|' Makefile sed -i 's|lib/NetworkManager|libexec|' network/utils_test.go sed -i 's|/usr/lib|%{_libexecdir}|' \ misc/*services/*.service \ + misc/systemd/services/*.service \ misc/etc/pam.d/deepin-auth \ misc/applications/deepin-toggle-desktop.desktop \ misc/dde-daemon/gesture.json \ @@ -108,7 +109,8 @@ sed -i 's|/usr/lib|%{_libexecdir}|' \ session/power/lid_switch.go \ service_trigger/manager.go \ bin/dde-system-daemon/main.go \ - bin/search/main.go + bin/search/main.go \ + accounts/image_blur.go # Fix grub.cfg path sed -i 's|boot/grub|boot/grub2|' grub2/{theme,log,entry,grub_params}.go @@ -187,11 +189,8 @@ fi %{_var}/lib/polkit-1/localauthority/10-vendor.d/com.deepin.daemon.Accounts.pkla %changelog -* Thu Aug 2 2018 mosquito - 3.2.22-1 -- Update to 3.2.22 - -* Fri Jul 20 2018 mosquito - 3.2.21-1 -- Update to 3.2.21 +* Sat Aug 25 2018 mosquito - 3.2.20-1 +- Update to 3.2.20 * Thu Jul 12 2018 Fedora Release Engineering - 3.2.9-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index 908f4d0..f3bed61 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (dde-daemon-3.2.22.tar.gz) = 6df6d5cebbfd5d71ca31b3812fe8a4892ba4c9607adbdad76f9325d28246c53a267a4b803f6abb42d05c1aa8e349c00c8377a5e9fcb6e47f8bd20d8c2bbf2507 +SHA512 (dde-daemon-3.2.20.tar.gz) = e1b56276b5234ec6a8696dd1da92b1e9276e73756d70177d3be0bdd7a0288d55c1281753237353fecf375d4d3452dfe2b801f6367e87a530a568e9b19c2f7553 SHA512 (default-settings-2016.9.8.tar.gz) = 174875142f049ed270a15e4334d9afa59275aa8db84cb15942905a17f2733555fd3e8ae4557c6caeab0bde00bcd606f294d058d0a8d7f584d54a168512b117f5