Accepting request 717204 from X11:Deepin:Factory

- Update version to 3.28.0
  * Update translations
  * change(api): lid-closed-sleep distinguish whether to use battery require new
    deepin-desktop-schemas
  * fix(network): notify when password wrong
  * feat(bluetooth): add discoverable in config to control adpater discoverable
    property
  * fix: pam config deepin-auth-keyboard
  * feat(bluetooth): try connect paired devices after startup/poweron/wakeup

- Update version to 3.27.2.6
  * fix: pam config deepin-auth-keyboard
  * feat(bluetooth): try connect paired devices after startup/poweron/wakeup 
  * fix(lockservice): user with a blank password authentication failure
  * fix(grub2): Theme.GetBackground return invalid file
  * fix(grub2): do not adjust theme when enable theme
  * fix(dock): menu item 'All windows' is not displayed
  * change(api): accounts User add PasswordStatus property
  * fix(dsync): Config.Destory method panic
  * chore: do not save QT_SCALE_FACTOR to ~/.dde_env
  * feat(keybinding): add reset for kwin shortcuts
  * fix(power): dde-session-daemon exit with error if failed to register
  * fix(keybinding): switch WM shortcut is easy to be triggered twice
  

- Update version to 3.27.2
  * feat(dock): window identify for deepin archon apps
  * chore: change polkit subject kind to system bus name
  * chore(appearance): do not set window theme during init
  * fix(appearance): do not change background after login

OBS-URL: https://build.opensuse.org/request/show/717204
OBS-URL: https://build.opensuse.org/package/show/X11:Deepin/deepin-daemon?expand=0&rev=6

dde-daemon-3.27.0.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0e11e4919e8d46c933a672223c68a37143fd5ad4222523bd85b040098abbd8ac
-size 2664214

dde-daemon-3.28.0.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d253ff9dd8c776d7d28f71daf0b73ae7c9f9659cc15b424afdbeae0e197ada18
+size 2689544

deepin-daemon.changes

@@ -1,3 +1,46 @@
+-------------------------------------------------------------------
+Thu Jul 18 14:19:57 UTC 2019 - Hillwood Yang <hillwood@opensuse.org>
+
+- Update version to 3.28.0
+  * Update translations
+  * change(api): lid-closed-sleep distinguish whether to use battery require new
+    deepin-desktop-schemas
+  * fix(network): notify when password wrong
+  * feat(bluetooth): add discoverable in config to control adpater discoverable
+    property
+  * fix: pam config deepin-auth-keyboard
+  * feat(bluetooth): try connect paired devices after startup/poweron/wakeup
+
+-------------------------------------------------------------------
+Mon Jul 15 08:45:26 UTC 2019 - Hillwood Yang <hillwood@opensuse.org>
+
+- Update version to 3.27.2.6
+  * fix: pam config deepin-auth-keyboard
+  * feat(bluetooth): try connect paired devices after startup/poweron/wakeup 
+  * fix(lockservice): user with a blank password authentication failure
+  * fix(grub2): Theme.GetBackground return invalid file
+  * fix(grub2): do not adjust theme when enable theme
+  * fix(dock): menu item 'All windows' is not displayed
+  * change(api): accounts User add PasswordStatus property
+  * fix(dsync): Config.Destory method panic
+  * chore: do not save QT_SCALE_FACTOR to ~/.dde_env
+  * feat(keybinding): add reset for kwin shortcuts
+  * fix(power): dde-session-daemon exit with error if failed to register
+  * fix(keybinding): switch WM shortcut is easy to be triggered twice
+  
+-------------------------------------------------------------------
+Tue May 21 03:42:13 UTC 2019 - hillwood Yang <hillwood@opensuse.org>
+
+- Update version to 3.27.2
+  * feat(dock): window identify for deepin archon apps
+  * chore: change polkit subject kind to system bus name
+  * chore(appearance): do not set window theme during init
+  * fix(appearance): do not change background after login
+  * fix(audio): use unavailable sink port
+  * chore(authority): add more log print
+  * feat(dock): process X-Deepin-Vendor field
+  * feat: add pam module deepin_auth 
+
 -------------------------------------------------------------------
 Tue Apr 23 13:01:44 UTC 2019 - Hillwood Yang <hillwood@opensuse.org>
 

deepin-daemon.spec

@@ -19,7 +19,7 @@
 %define   import_path pkg.deepin.io/dde/daemon
 
 Name:           deepin-daemon
-Version:        3.27.0
+Version:        3.28.0
 Release:        0
 Summary:        Daemon handling the DDE session settings
 License:        GPL-3.0+
@@ -122,9 +122,11 @@ BuildRequires:  golang(github.com/msteinert/pam)
 BuildRequires:  golang(github.com/axgle/mahonia)
 BuildRequires:  golang(gopkg.in/yaml.v2)
 BuildRequires:  golang(github.com/gosexy/gettext)
+BuildRequires:  golang(github.com/stretchr/testify/mock)
 BuildRequires:  golang-github-linuxdeepin-dde-api
 BuildRequires:  rsvg-view
 BuildRequires:  systemd
+BuildRequires:  systemd-rpm-macros
 Requires:       deepin-desktop-base
 Requires:       deepin-desktop-schemas
 Requires:       deepin-osd
@@ -137,11 +139,12 @@ Requires:       upower
 Requires:       xdotool
 Requires:       wallpaper-branding-openSUSE
 Recommends:     %{name}-lang = %{version}
+Recommends:     %{name}-pam = %{version}
 Recommends:     iso-codes
 Recommends:     mobile-broadband-provider-info
 AutoReqProv:    Off
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%{?systemd_requires}
+%{?systemd_ordering}
 
 %description
 Deepin Daemon is a daemon for handling the deepin session settings
@@ -217,7 +220,27 @@ AutoReqProv:    On
 This package contains library source intended forbuilding other packages which
 use import path with pkg.deepin.io/dde/daemon prefix.
 
-%lang_package
+%package pam
+Summary:        Deepin Keyring - PAM module
+Group:          System/GUI/Other
+Requires:       %{name} = %{version}
+PreReq:         pam-config >= 0.72
+PreReq:         sed
+AutoReqProv:    Off
+
+%description pam
+Deepin Daemon is a daemon for handling the deepin session settings
+
+The PAM module can be used to unlock the keyring on login.
+
+%package lang
+Summary:        Translations for package %{name}
+Group:          System/Localization
+Requires:       %{name} = %{version}
+AutoReqProv:    Off
+
+%description lang
+Provides translations for the "%{name}" package.
 
 %prep
 %setup -q -n %{_name}-%{version}
@@ -241,7 +264,7 @@ make %{?_smp_mflags}
 %install
 %goinstall
 %gosrc
-%make_install
+%make_install PAM_MODULE_DIR=/%{_lib}/security
 pushd %{buildroot}%{_libexecdir}/deepin-daemon
     ln -s ../../bin/* .
 popd
@@ -301,6 +324,11 @@ fi
 %dir %{_sysusersdir}
 %{_sysusersdir}/%{name}.conf
 %dir %{_libexecdir}/systemd/logind.conf.d
+%dir %{_sysconfdir}/acpi
+%dir %{_sysconfdir}/acpi/actions
+%dir %{_sysconfdir}/acpi/events
+%{_sysconfdir}/acpi/actions/deepin_lid.sh
+%{_sysconfdir}/acpi/events/deepin_lid
 %{_libexecdir}/systemd/logind.conf.d/10-%{name}.conf
 %{_datadir}/dbus-1/services/*.service
 %{_datadir}/dbus-1/system-services/*.service
@@ -317,11 +345,14 @@ fi
 /var/cache/appearance/
 %{_unitdir}/deepin-accounts-daemon.service
 %{_sbindir}/rcdeepin-accounts-daemon
-%dir /var/lib/polkit-1
+%dir %{_var}/lib/polkit-1
-%dir /var/lib/polkit-1/localauthority
+%dir %{_var}/lib/polkit-1/localauthority
-%dir /var/lib/polkit-1/localauthority/10-vendor.d
+%dir %{_var}/lib/polkit-1/localauthority/10-vendor.d
-/var/lib/polkit-1/localauthority/10-vendor.d/com.deepin.daemon.Accounts.pkla
+%{_var}/lib/polkit-1/localauthority/10-vendor.d/com.deepin.daemon.Accounts.pkla
-/var/lib/polkit-1/localauthority/10-vendor.d/com.deepin.daemon.Grub2.pkla
+%{_var}/lib/polkit-1/localauthority/10-vendor.d/com.deepin.daemon.Grub2.pkla
+
+%files pam
+%attr(555,root,root) /%{_lib}/security/*.so
 
 %files -n golang-github-linuxdeepin-deepin-daemon -f file.lst
 %defattr(-,root,root,-)

disable-gobuild-in-makefile.patch

@@ -1,39 +1,41 @@
-diff -Nur dde-daemon-3.25.2/Makefile dde-daemon-3.25.2-new/Makefile
+diff -Nur dde-daemon-3.28.0/Makefile dde-daemon-3.28.0-new/Makefile
---- dde-daemon-3.25.2/Makefile	2019-04-10 11:49:27.000000000 +0800
+--- dde-daemon-3.28.0/Makefile	2019-07-15 17:58:49.000000000 +0800
-+++ dde-daemon-3.25.2-new/Makefile	2019-04-14 15:44:25.339116300 +0800
++++ dde-daemon-3.28.0-new/Makefile	2019-07-18 22:33:27.156770800 +0800
-@@ -4,7 +4,7 @@
+@@ -4,8 +4,8 @@
  GOBUILD = go build
  
  BINARIES =  \
 -	    dde-session-daemon \
+-	    dde-system-daemon \
 +#	    dde-session-daemon \
- 	    dde-system-daemon \
++#	    dde-system-daemon \
  	    grub2 \
  	    search \
-@@ -15,7 +15,7 @@
+ 	    theme-thumb-tool \
+@@ -14,7 +14,7 @@
+ 	    soundeffect \
  	    dde-lockservice \
  	    dde-authority \
- 	    dde-authority-pam \
 -	    default-terminal \
 +#	    default-terminal \
  	    dde-greeter-setter
  
  LANGUAGES = $(basename $(notdir $(wildcard misc/po/*.po)))
-@@ -30,7 +30,7 @@
+@@ -29,7 +29,7 @@
  		fi
  
- out/bin/%:
+ out/bin/%: prepare
 -	env GOPATH="${CURDIR}/${GOPATH_DIR}:${GOPATH}" ${GOBUILD} -o $@  ${GOPKG_PREFIX}/bin/${@F}
 +#	env GOPATH="${CURDIR}/${GOPATH_DIR}:${GOPATH}" ${GOBUILD} -o $@  ${GOPKG_PREFIX}/bin/${@F}
  
  out/bin/default-file-manager: bin/default-file-manager/main.c
  	gcc $^ $(shell pkg-config --cflags --libs gio-unix-2.0) -o $@
-@@ -55,7 +55,7 @@
+@@ -58,7 +58,7 @@
  	deepin-policy-ts-convert ts2policy misc/polkit-action/com.deepin.daemon.Grub2.policy.in misc/ts/com.deepin.daemon.Grub2.policy misc/polkit-action/com.deepin.daemon.Grub2.policy
  	deepin-policy-ts-convert ts2policy misc/polkit-action/com.deepin.daemon.accounts.policy.in misc/ts/com.deepin.daemon.accounts.policy misc/polkit-action/com.deepin.daemon.accounts.policy
  
--build: prepare out/bin/default-terminal out/bin/default-file-manager out/bin/desktop-toggle $(addprefix out/bin/, ${BINARIES}) ts_to_policy
+-build: prepare out/bin/default-terminal out/bin/default-file-manager out/bin/desktop-toggle out/pam_deepin_auth.so $(addprefix out/bin/, ${BINARIES}) ts_to_policy
-+build: prepare out/bin/default-file-manager out/bin/desktop-toggle $(addprefix out/bin/, ${BINARIES}) ts_to_policy
++build: prepare out/bin/default-file-manager out/bin/desktop-toggle out/pam_deepin_auth.so $(addprefix out/bin/, ${BINARIES}) ts_to_policy
  
  test: prepare
  	env GOPATH="${GOPATH}:${CURDIR}/${GOPATH_DIR}" go test -v ./...