From 8d738c8a216169daff51323d57bc223c589749f01aa96efbb27fc3d66dde7911 Mon Sep 17 00:00:00 2001 From: Hillwood Yang Date: Thu, 25 Apr 2019 01:52:57 +0000 Subject: [PATCH] Accepting request 697522 from X11:Deepin:Factory - Update version to 3.27.0 * chore: auto pull translation files from transifex * change(api): dde-authority add method HasCookie * feat(dde-authority): fprint transcation give message based on user locale * fix(appearance): do not change background after logging in * fix: deepin-installer.conf * fix(lockservice): panic: send on closed channel * fix(authority): user in group nopasswdlogin auth failed - Rewrite spec with golang-packaging * Add disable-gobuild-in-makefile.patch - Update version to 3.25.2 * chore: auto pull translation files from transifex * chore: update depends for wm * feat(appearance): support set kwin window decoration theme * fix(greeter-setter): UpdateGreeterQtTheme rename failed * chore: update tranlations * feat(launcher): process X-Deepin-Vendor field * feat(dock): add method RemovePluginSettings * feat(dock): add method MergePluginSettings * feat(audio): add sync supported * feat(lastore): add sync supported * feat(appearance): add greeter background for deepin sync * feat(network): add sync supported * feat(inputdevices): add sync supported * feat(screenedge): add sync supported * feat(dock): continue to support deepin sync * feat(dock): support deepin sync * feat(appearance): support deepin sync * feat(launcher): support deepin sync OBS-URL: https://build.opensuse.org/request/show/697522 OBS-URL: https://build.opensuse.org/package/show/X11:Deepin/deepin-daemon?expand=0&rev=4 --- dde-daemon-3.2.7.tar.gz | 3 - dde-daemon-3.27.0.tar.gz | 3 + deepin-daemon-fix-policy-settings.patch | 87 ++++ deepin-daemon-fix-wrong-policy-settings.patch | 50 --- deepin-daemon-libinput.patch | 96 ++--- deepin-daemon-rpmlintrc | 3 + deepin-daemon.changes | 394 +++++++++++++++++- deepin-daemon.spec | 225 ++++++++-- disable-gobuild-in-makefile.patch | 39 ++ 9 files changed, 747 insertions(+), 153 deletions(-) delete mode 100644 dde-daemon-3.2.7.tar.gz create mode 100644 dde-daemon-3.27.0.tar.gz create mode 100644 deepin-daemon-fix-policy-settings.patch delete mode 100644 deepin-daemon-fix-wrong-policy-settings.patch create mode 100644 disable-gobuild-in-makefile.patch diff --git a/dde-daemon-3.2.7.tar.gz b/dde-daemon-3.2.7.tar.gz deleted file mode 100644 index 801a7f7..0000000 --- a/dde-daemon-3.2.7.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f8368e42b7714cc5a44ebc907c22a6ef39f7357754af9c8cf1b586ad40d44500 -size 2768849 diff --git a/dde-daemon-3.27.0.tar.gz b/dde-daemon-3.27.0.tar.gz new file mode 100644 index 0000000..29c40f4 --- /dev/null +++ b/dde-daemon-3.27.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0e11e4919e8d46c933a672223c68a37143fd5ad4222523bd85b040098abbd8ac +size 2664214 diff --git a/deepin-daemon-fix-policy-settings.patch b/deepin-daemon-fix-policy-settings.patch new file mode 100644 index 0000000..9b53436 --- /dev/null +++ b/deepin-daemon-fix-policy-settings.patch @@ -0,0 +1,87 @@ +diff -Nur dde-daemon-3.25.2/misc/polkit-action/com.deepin.daemon.accounts.policy.in dde-daemon-3.25.2-new/misc/polkit-action/com.deepin.daemon.accounts.policy.in +--- dde-daemon-3.25.2/misc/polkit-action/com.deepin.daemon.accounts.policy.in 2019-04-10 11:49:27.000000000 +0800 ++++ dde-daemon-3.25.2-new/misc/polkit-action/com.deepin.daemon.accounts.policy.in 2019-04-14 20:40:20.450184100 +0800 +@@ -10,7 +10,7 @@ + Change your own user data + Authentication is required to change your own user data + +- no ++ auth_admin + no + auth_self + +@@ -20,7 +20,7 @@ + Manage user accounts + Authentication is required to change user data + +- no ++ auth_admin + no + auth_admin_keep + +@@ -30,7 +30,7 @@ + Enable Auto Login + Authentication is required to enable auto login + +- no ++ auth_admin + no + auth_self + +@@ -40,7 +40,7 @@ + Disable Auto Login + Authentication is required to disable auto login + +- no ++ auth_admin + no + auth_self + +@@ -50,7 +50,7 @@ + Enable Login without password + Authentication is required to enable login without password + +- no ++ auth_admin + no + auth_self + +@@ -60,7 +60,7 @@ + Disable Login without password + Authentication is required to disable login without password + +- no ++ auth_admin + no + auth_self + +@@ -70,7 +70,7 @@ + Set keyboard layout + Authentication is required to set keyboard layout + +- no ++ auth_admin + no + auth_self + +diff -Nur dde-daemon-3.25.2/misc/polkit-action/com.deepin.daemon.Grub2.policy.in dde-daemon-3.25.2-new/misc/polkit-action/com.deepin.daemon.Grub2.policy.in +--- dde-daemon-3.25.2/misc/polkit-action/com.deepin.daemon.Grub2.policy.in 2019-04-10 11:49:27.000000000 +0800 ++++ dde-daemon-3.25.2-new/misc/polkit-action/com.deepin.daemon.Grub2.policy.in 2019-04-14 20:39:15.084613200 +0800 +@@ -10,7 +10,7 @@ + Change the grub2 configuration + Authentication is required to change the grub2 configuration + +- no ++ auth_admin + no + auth_admin_keep + +@@ -20,7 +20,7 @@ + Prepare grub2 display resolution detection + Authentication is required to prepare grub2 display resolution detection + +- no ++ auth_admin + no + auth_admin_keep + diff --git a/deepin-daemon-fix-wrong-policy-settings.patch b/deepin-daemon-fix-wrong-policy-settings.patch deleted file mode 100644 index a26f0b8..0000000 --- a/deepin-daemon-fix-wrong-policy-settings.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff -Nur dde-daemon-3.2.7/misc/polkit-action/com.deepin.daemon.accounts.policy dde-daemon-3.2.7-new/misc/polkit-action/com.deepin.daemon.accounts.policy ---- dde-daemon-3.2.7/misc/polkit-action/com.deepin.daemon.accounts.policy 2017-11-28 11:31:45.000000000 +0800 -+++ dde-daemon-3.2.7-new/misc/polkit-action/com.deepin.daemon.accounts.policy 2017-11-29 15:57:49.641270102 +0800 -@@ -70,8 +70,8 @@ - 修改您的用户数据：需要授权 - 若要變更您自身的使用者資料需要通過認證 - -- no -- no -+ auth_admin -+ auth_admin - auth_self - - -@@ -140,8 +140,8 @@ - 修改用户数据：需要授权 - 若要變更使用者資料需要通過認證 - -- no -- no -+ auth_admin -+ auth_admin - auth_admin_keep - - -@@ -210,8 +210,8 @@ - 修改登录窗口配置：需要授权 - 若要變更登入畫面組態需要通過認證 - -- no -- no -+ auth_admin -+ auth_admin - auth_admin_keep - - -diff -Nur dde-daemon-3.2.7/misc/polkit-action/com.deepin.daemon.Grub2.policy.in dde-daemon-3.2.7-new/misc/polkit-action/com.deepin.daemon.Grub2.policy.in ---- dde-daemon-3.2.7/misc/polkit-action/com.deepin.daemon.Grub2.policy.in 2017-11-28 11:31:45.000000000 +0800 -+++ dde-daemon-3.2.7-new/misc/polkit-action/com.deepin.daemon.Grub2.policy.in 2017-11-29 15:58:19.296468907 +0800 -@@ -10,8 +10,8 @@ - Change the grub2 configuration - Authentication is required to change the grub2 configuration - -- no -- no -+ auth_admin -+ auth_admin - auth_admin_keep - - diff --git a/deepin-daemon-libinput.patch b/deepin-daemon-libinput.patch index 9b71115..2b7cfda 100644 --- a/deepin-daemon-libinput.patch +++ b/deepin-daemon-libinput.patch @@ -1,10 +1,12 @@ -diff -Nur dde-daemon-3.2.6/misc/dde-daemon/gesture.json dde-daemon-3.2.6-new/misc/dde-daemon/gesture.json ---- dde-daemon-3.2.6/misc/dde-daemon/gesture.json 2017-11-16 20:32:17.000000000 +0800 -+++ dde-daemon-3.2.6-new/misc/dde-daemon/gesture.json 2017-11-29 23:16:08.696136900 +0800 -@@ -54,15 +54,6 @@ +diff --git a/misc/dde-daemon/gesture.json b/misc/dde-daemon/gesture.json +index 2fc0ce60..9548d8f2 100644 +--- a/misc/dde-daemon/gesture.json ++++ b/misc/dde-daemon/gesture.json +@@ -53,15 +53,6 @@ + "Action": "ShowWindow" } }, - { +- { - "Name": "tap", - "Direction": "none", - "Fingers": 3, @@ -13,14 +15,14 @@ diff -Nur dde-daemon-3.2.6/misc/dde-daemon/gesture.json dde-daemon-3.2.6-new/mis - "Action": "MoveWindow" - } - }, -- { + { "Name": "swipe", "Direction": "up", - "Fingers": 4, -diff -Nur dde-daemon-3.2.6/system/gesture/core.c dde-daemon-3.2.6-new/system/gesture/core.c ---- dde-daemon-3.2.6/system/gesture/core.c 2017-11-16 20:32:17.000000000 +0800 -+++ dde-daemon-3.2.6-new/system/gesture/core.c 2017-11-29 23:20:21.688875700 +0800 -@@ -211,16 +211,16 @@ +diff --git a/system/gesture/core.c b/system/gesture/core.c +index 750baabb..066c4fd9 100644 +--- a/system/gesture/core.c ++++ b/system/gesture/core.c +@@ -294,16 +294,16 @@ handle_gesture_events(struct libinput_event *ev, int type) } raw_event_reset(raw); break; @@ -28,70 +30,38 @@ diff -Nur dde-daemon-3.2.6/system/gesture/core.c dde-daemon-3.2.6-new/system/ges - break; - case LIBINPUT_EVENT_GESTURE_TAP_END: - if (libinput_event_gesture_get_cancelled(gesture)) { -- break; +- break; - } - raw->fingers = libinput_event_gesture_get_finger_count(gesture); -- printf("[Tap] fingers: %d\n", raw->fingers); +- g_debug("[Tap] fingers: %d", raw->fingers); - handleGestureEvent(GESTURE_TYPE_TAP, GESTURE_DIRECTION_NONE, raw->fingers); - break; -+ /* case LIBINPUT_EVENT_GESTURE_TAP_BEGIN: */ -+ /* break; */ -+ /* case LIBINPUT_EVENT_GESTURE_TAP_END: */ -+ /* if (libinput_event_gesture_get_cancelled(gesture)) { */ -+ /* break; */ -+ /* } */ -+ /* raw->fingers = libinput_event_gesture_get_finger_count(gesture); */ -+ /* printf("[Tap] fingers: %d\n", raw->fingers); */ -+ /* handleGestureEvent(GESTURE_TYPE_TAP, GESTURE_DIRECTION_NONE, raw->fingers); */ -+ /* break; */ ++ /*case LIBINPUT_EVENT_GESTURE_TAP_BEGIN:*/ ++ /*break;*/ ++ /*case LIBINPUT_EVENT_GESTURE_TAP_END:*/ ++ /*if (libinput_event_gesture_get_cancelled(gesture)) {*/ ++ /*break;*/ ++ /*}*/ ++ /*raw->fingers = libinput_event_gesture_get_finger_count(gesture);*/ ++ /*g_debug("[Tap] fingers: %d", raw->fingers);*/ ++ /*handleGestureEvent(GESTURE_TYPE_TAP, GESTURE_DIRECTION_NONE, raw->fingers);*/ ++ /*break;*/ } } -@@ -278,13 +278,10 @@ - } - case LIBINPUT_EVENT_GESTURE_PINCH_BEGIN: - case LIBINPUT_EVENT_GESTURE_PINCH_UPDATE: -- case LIBINPUT_EVENT_GESTURE_PINCH_END: -- case LIBINPUT_EVENT_GESTURE_SWIPE_BEGIN: -- case LIBINPUT_EVENT_GESTURE_SWIPE_UPDATE: +@@ -410,10 +410,10 @@ handle_events(struct libinput *li) + case LIBINPUT_EVENT_GESTURE_PINCH_END: + case LIBINPUT_EVENT_GESTURE_SWIPE_BEGIN: + case LIBINPUT_EVENT_GESTURE_SWIPE_UPDATE: - case LIBINPUT_EVENT_GESTURE_SWIPE_END: - case LIBINPUT_EVENT_GESTURE_TAP_BEGIN: - case LIBINPUT_EVENT_GESTURE_TAP_UPDATE: - case LIBINPUT_EVENT_GESTURE_TAP_END:{ -+ /* case LIBINPUT_EVENT_GESTURE_TAP_BEGIN: */ -+ /* case LIBINPUT_EVENT_GESTURE_TAP_UPDATE: */ -+ /* case LIBINPUT_EVENT_GESTURE_TAP_END: */ + case LIBINPUT_EVENT_GESTURE_SWIPE_END:{ ++ /*case LIBINPUT_EVENT_GESTURE_TAP_BEGIN:*/ ++ /*case LIBINPUT_EVENT_GESTURE_TAP_UPDATE:*/ ++ /*case LIBINPUT_EVENT_GESTURE_TAP_END:{*/ handle_gesture_events(ev, type); break; } -diff -Nur dde-daemon-3.2.6/system/gesture/gesture.go dde-daemon-3.2.6-new/system/gesture/gesture.go ---- dde-daemon-3.2.6/system/gesture/gesture.go 2017-11-16 20:32:17.000000000 +0800 -+++ dde-daemon-3.2.6-new/system/gesture/gesture.go 2017-11-29 23:11:14.265531500 +0800 -@@ -42,9 +42,9 @@ - var ( - GestureTypeSwipe = GestureType(C.GESTURE_TYPE_SWIPE) - GestureTypePinch = GestureType(C.GESTURE_TYPE_PINCH) -- GestureTypeTap = GestureType(C.GESTURE_TYPE_TAP) -+ // GestureTypeTap = GestureType(C.GESTURE_TYPE_TAP) - -- GestureDirectionNone = GestureType(C.GESTURE_DIRECTION_NONE) -+ // GestureDirectionNone = GestureType(C.GESTURE_DIRECTION_NONE) - GestureDirectionUp = GestureType(C.GESTURE_DIRECTION_UP) - GestureDirectionDown = GestureType(C.GESTURE_DIRECTION_DOWN) - GestureDirectionLeft = GestureType(C.GESTURE_DIRECTION_LEFT) -@@ -59,10 +59,10 @@ - return "swipe" - case GestureTypePinch: - return "pinch" -- case GestureTypeTap: -- return "tap" -- case GestureDirectionNone: -- return "none" -+ // case GestureTypeTap: -+ // return "tap" -+ // case GestureDirectionNone: -+ // return "none" - case GestureDirectionUp: - return "up" - case GestureDirectionDown: + diff --git a/deepin-daemon-rpmlintrc b/deepin-daemon-rpmlintrc index 92fbe52..42e69f7 100644 --- a/deepin-daemon-rpmlintrc +++ b/deepin-daemon-rpmlintrc @@ -1,3 +1,6 @@ +addFilter("devel-file-in-non-devel-package .*/usr/share/go/1.11/contrib/src/pkg.deepin.io/*") addFilter('suse-dbus-unauthorized-service') setBadness('suse-dbus-unauthorized-service', 0) setBadness('polkit-unauthorized-privilege', 0) +addFilter('polkit-untracked-privilege') +setBadness('polkit-untracked-privilege', 0) diff --git a/deepin-daemon.changes b/deepin-daemon.changes index b40d133..2855afd 100644 --- a/deepin-daemon.changes +++ b/deepin-daemon.changes @@ -1,3 +1,393 @@ +------------------------------------------------------------------- +Tue Apr 23 13:01:44 UTC 2019 - Hillwood Yang + +- Update version to 3.27.0 + * chore: auto pull translation files from transifex + * change(api): dde-authority add method HasCookie + * feat(dde-authority): fprint transcation give message based on user locale + * fix(appearance): do not change background after logging in + * fix: deepin-installer.conf + * fix(lockservice): panic: send on closed channel + * fix(authority): user in group nopasswdlogin auth failed + +------------------------------------------------------------------- +Sun Apr 14 12:15:21 UTC 2019 - Hillwood Yang + +- Rewrite spec with golang-packaging + * Add disable-gobuild-in-makefile.patch +- Update version to 3.25.2 + * chore: auto pull translation files from transifex + * chore: update depends for wm + * feat(appearance): support set kwin window decoration theme + * fix(greeter-setter): UpdateGreeterQtTheme rename failed + * chore: update tranlations + * feat(launcher): process X-Deepin-Vendor field + * feat(dock): add method RemovePluginSettings + * feat(dock): add method MergePluginSettings + * feat(audio): add sync supported + * feat(lastore): add sync supported + * feat(appearance): add greeter background for deepin sync + * feat(network): add sync supported + * feat(inputdevices): add sync supported + * feat(screenedge): add sync supported + * feat(dock): continue to support deepin sync + * feat(dock): support deepin sync + * feat(appearance): support deepin sync + * feat(launcher): support deepin sync + * feat(dde-session-daemon): sync login sound config after all module started + * fix(soundeffect): still play login sound even if sound effect switch is off + * chore: auto pull translation files from transifex + * change(api): com.deepin.daemon.Greeter add method UpdateGreeterQtTheme + * fix: ScreenScaleFactors cannot be easily parsed by greeter + * feat: also set the screen scale factors of the greeter + * fix(accounts): user was not added to some groups when creating user + * feat(grub2): keep GRUB_BACKGROUND empty if enable theme + * feat(keybinding): add support for dde-kwin shortucts + * chore: auto pull translation files from transifex + * auto sync po files from transifex + * chore: copywriting optimization + * fix(dock): CurrentWindow prop of entry wrong after window detach + * fix(dock): some bugs when use kwin as wm + * change(api): appearance add methods GetScreenScaleFactors and + SetScreenScaleFactors + * feat: add pam-config for deepin-auth + * feat(audo): also save the state of alsa when saving the config + * chore(langselector): remove failed test + * fix(audio): trySelectBestPort do not work + * change(api): sound effect add more functions + * change(api): add sytem service com.deepin.system.Network + * feat(bluetooth): when disconnected quickly after connecting, automatically + try to connect + * chore(miracast): use go-dbus-factory + * chore: use pkg.deepin.io/gir + * fix(launcher) lost dbus conn when file name is invalid utf8 string + * fix(dock): items removed when application updated + * chore: change log level to warn + * refactor(keybinding): extend execCmd method + * remove usage of qdbus command + * refactor(audio): simplify method setPort + * fix: failed to init keyboard layout when auto login enabled + * feat(appearance): wallpaper slideshow supported + * feat(session/power): inhibits logind handle power key and lid switch on + runtime + * chore(accounts): check user greeter background validity + * fix(network): secret agent save wrong default collection path + * fix(dock): lost dbus conn when name of app entry is invalid utf8 string + * chore: add network-manager-sstp to suggests + * fix(screensaver): module start failed if x ext dpms not present + * feat(langselector): add method GetLanguageSupportPackages for debug + * feat: use dde-api package userenv + * chore(accounts): get default background do not read file default.conf + * fix(network): wired connection auto connect logic is wrong + * chore(systeminfo): update test data + * feat: speed up dde-session-daemon part2 startup + * feat(dock): add property Opacity + * fix(launcher): panic: assignment to entry in nil map + * chore(grub2): add option -setup-theme for compatibility + * chore: do not disconnect device when device activating + * auto sync po files from transifex + * feat(inputdevices): limit imwheel to only grab wheel up and down + * feat(geature): add longpress blacklist + * fix(clipboard): cannot copy pictures to the wine program + * feat(soundeffect): add method GetSystemSoundFile + * feat(power): stop screensaver before turn off screen + * feat: rewrite clipboard module + * refactor: replace abs coordinate with relative + * feat(power): call CanSupsend before suspend + * feat(grub2): gfxmode detect failed fallback to deepin-falback + * fix(system/power): not found lid switch under the `sw_64` arch + * fix(keybinding): GetShortcut missing Exec field for custom shortcut + * chore: compile with sw arch no longer needs to use gccgo + * fix(grub2): call dbus method PrepareGfxmodeDetect gfxmodes not sort + * fix(network): the state changed signal of the active connection is not + monitored + * fix(dock): dock app but not saved + * chore(trayicon): add env var for disable status notifier watcher + * fix(appearance): panic if user object is nil + * chore(network): change the log level of request scan error to debug + * feat(network): can handle the change of the security type of the access + point + * refactor(network): fix typo + * chore(network): remove dbus watcher + * chore(network): remove unused code + * chore(dock): specially stated that dde-launcher should not be displayed + * fix(dock): call RequestDock failed + * chore(grub2): -prepare-gfxmode-detect do not update grub cfg + * fix: The resolution of the display has changed, but the resolution of the + grub theme has not been adjusted in time. + * chore(debian): modify recommends proxychains-ng to proxychains4 + * feat(session/power): screensaver supported + * auto sync po files from transifex + * chore(grub2): use lib imgutil + * feat: add new module grub-gfx + * feat(trayicon): add StatusNotifierWatcher + * fix(launcher): failed to uninstall CrossOver + * feat(network): add property Connectivity + * chore(default-terminal): pass command line options directly + * fix(network): failed to watch network manager restart + * fix(appearance): do not fallback to default icon theme + * feat(dock): add method GetDockedAppsDesktopFiles + * fix: some types + * fix: only remove batteries + * feat(gesture): make touch long press as right button + * fix(lastore): restore source no call UpdateSource + * fix(dock): dde-launcher show on dock + * fix(accounts): new user locale is empty + * fix(network): secret agent didn't notice the requst new flag + * network: suppress errors on tun device + * fix(network): call ActivateAccessPoint causes dbus conn close + * fix(network): vpn connection auto connect dose not work + * fix(grub2): func GetAvailableResolutions is not implemented + * fix(audio): the sound card name is too long + * chore: remove grub-themes-deepin from suggests + * auto sync po files from transifex + * fix: compile errors under networkmanager 1.14+ + * refactor: fix a typo + * feat(grub2): use adjust-grub-theme to adjust theme + * feat(network): add new secert agent + * fix(appearance): signal Changed type and value empty when background changed + * fix(network): libnotify not inited + * feat(keybinding): workaround for huawei::mic led + * feat(appearance): do not allow to delete current backgrounds + * fix(network): nmGetDevices nil pointer panic + * fix(inputdevices): keyboard default layout name empty + * fix(network): device hw address empty + * feat(appearance): add Opacity property + * fix: can't get the name of bluetooth speaker + * feat(session/power): support automatically adjust brightness + * feat(accounts): image blur check blurred image file existence + * fix(keybinding): ShortcutManager.grabKeystroke panic + * fix(keybinding): some data race problems + * chore(dock): handle destroy notify event no check ev.Event + * fix(system/power): lid switch not found + * fix(network): correntIPv6DataType not working + * fix(keybinding): EnableRecord panic nil pointer dereference + * feat(dock): menu items excludes AllWindows when use 2D WM + * fix(network): agent.cancelVpnAuthDialog panic process is nil + * feat: add trigger to link ttc for java + * feat(accounts): support for configuring default user background + * feat(dock): entry add method GetAllowedCloseWindows + * feat(dock): dbus method allow argument desktopFile is file:// url + * fix(default-terminal): fallback if session manager failure + * fix(audio): saveConfig panic nil pointer dereference + * feat(keybinding): add config file handle touchpad toggle + * fix(network): panic you should call *proxy.Object.InitSignalExt() first + * chore: update build depends debhelper (>= 9) + * feat(accounts): logined service add LastLogoutUser property + * fix(x-event-monitor): no listen raw touch event + * chore: auto sync po/ts files from transifex + * fix(launcher):flatdeb app category wrong + * fix(network): vpn disconnect notify name is empty + * feat(audio): handle laptop headphones available state changed when user + session is inactive + * fix(dock): AppEntries.mu and Entry.PropsMu dead lock + * chore: update call method for com.deepin.api.device + * auto sync po files from transifex + * fix(network): failed to watch network manager restart + * fix(session/power): not save display brightness when power saving mode + changed + * refactor(network): use newly lib dbusutil + * fix(dock): getActiveWinGroup + * fix(mouse): handle accel profile change from gsettings + * feat(mouse): ability to change mouse accel profile + * chore(debian): update depends + * chore: auto sync po files from transifex + * chore(appearance): move set/get scale factor code to startdde + * chore: enable lastore module + * fix(system/power): failed to set power saving mode + * feat(screensaver): application disconnects from the D-Bus session auto call + uninhibit + * feat(lastore): clean archives from UI do not send notification + * change laptop-mode-tools to recommends + * perf(miracast): enable daemon when needed + * chore(debian): depends on dnsmasq-base instead of dnsmasq + * auto sync po files from transifex + * feat(session/power): improve english battery low messages + * fix(network): doGuessDevice + * fix(network): getVpnNameFile + * auto sync po files from transifex + * feat: add module lastore + * auto sync po files from transifex + * chore(x-event-monitor): use go-x11-client + * feat: merge dde-session-daemon and dde-session-init + * fix(apps): incorrect use of csv.Writer + * feat(keybinding): show osd for audio-mic-mute and wlan + * feat(power): add power saving mode + * chore(accounts): use lib policykit1 new feature + * chore(timedated): no use pkg.deepin.io/lib/polkit + * chore(grub2): no use pkg.deepin.io/lib/polkit + * chore(accounts): use go-dbus-factory + * chore(apps): use go-dbus-factory + * chore(timedated): use go-dbus-factory + * chore(swapsched): use go-dbus-factory + * chore(langselector): refactor code + * chore(system-daemon): remove unused func requestUnblockAllDevice + * chore(langselector): use go-dbus-factory + * chore(appearance): use go-dbus-factory + * chore(bluetooth): use go-dbus-factory + * chore(launcher): use go-dbus-factory + * chore(inputdevices): use go-x11-client + * chore(dock): use go-dbus-factory + * chore(default-terminal): use go-dbus-factory + * chore: do not beep if dde-session-init request name failed + * perf: optimize key2Mod + * chore(session/power): use go-x11-client + * fix: x resource id not freed + * chore: update for go-x11-client + * perf(apps): do not loop check subrecorder root ok + * feat(x_event_monitor): add debug method DebugGetPidAreasMap + * chore(screensaver): use go-x11-client + * fix(x_event_monitor): test build failed + * chore(x_event_monitor): remove debug for handleKeyboardEvent + * chore(x_event_monitor): use lib go-x11-client + * fix(audio): some data race problems + * chore: update for go-x11-client + * chore(dock): use lib go-x11-client + * fix(launcher): no app found in launcher + * auto sync po files from transifex + * fix(apps) dead lock again + * chore(accounts): users in the nopasswdlogin group are treated as human users + * fix(apps): dead lock + * chore(appearance): do not list pictures in dir /usr/share/backgrounds + * feat(inputdevices): layout only saved in accounts user + * fix(network/proxychains): failed to remove conf if type0 is empty + * fix(session-daemon): some data race problems + * feat(appearance): sync desktop backgrounds during startup + * fix(dock): panic if winInfo.wmClass is nil + * chore(dock): entry.attachWindow print window info + * chore: update makefile + * chore: update makefile for arch `sw_64` + * fix(gesture): disabled if session inactive + * add fprintd depends in `Desktop edition system` + * fix(network): allow to delete when creating vpn connection + * chore(debian): update build-depends + * feat(apps): record the launched state of the removed app + * auto sync po files from transifex + * feat(appearances): set standard font as monospace font fallback + * fix(appearance): cursor size of window border is small + * chore(housekeeping): use go-dbus-factory + * fix(bluetooth): remove adapters and devices config + * chore(launcher): move launcher module to dde-session-daemon + * fix(bluetooth): adapter powered not saved + * auto sync po files from transifex + * refactor(bluetooth): refactor code again + * refactor(bluetooth): refactor code + * feat(bluetooth): add signal Cancelled + * chore(bluetooth): use go-dbus-factory + * chore(appearance): use go-dbus-factory + * chore(audio): use go-dbus-factory + * chore(fprintd) use go-dbus-factory + * chore(systeminfo): use go-dbus-factory + * chore(timedate): use go-dbus-factory + * chore(gesture): use go-dbus-factory + * chore(screenedge): use go-dbus-factory + * chore(keybinding): use go-dbus-factory + * fix(apps): directory permissions is not 0755 + * chore(sessionwatcher): use go-dbus-factory + * chore(session/power): use go-dbus-factory + * feat: add UI unified authentication service + * fix(session/power): submodule name typo + * fix(session/power): submodule name typo + * fix(network): close hotspot no send notification + * feat(default-terminal): remove --launch-app option + * feat(network): ConnectionSession add method SetKeyFd + * feat(keybinding): allow volume to be adjusted to maximum 150% + * feat: add apps.com.wechat.web to window_patterns + * feat(appearance): limit the number of custom wallpapers + * fix(miracast): failed to emit signal Added and Removed + +------------------------------------------------------------------- +Thu Apr 12 02:44:45 UTC 2018 - hillwood@opensuse.org + +- Update version to 3.2.13. + * chore(dock): add window pattern for gdevelop + * fix(appearance): add rgba seetings for wine + * auto sync po files from transifex + * feat(dock): add window identify for org.deepin.flatdeb.* + * refactor: improve english + * refactor(miracast): use newly lib dbusutil + * fix(session-daemon): different modules startup sequence + * auto sync po files from transifex + * fix(audio): nil pointer error in handleCardEvent + * refactor(session-daemon): use newly lib dbusutil + * refactor(bluetooth): use newly lib dbusutil + * fix(accounts): get blurred image without compare change time + * refactor(fprintd): use newly lib dbusutil + * refactor(audio): use newly lib dbusutil + * refactor(inputdevices): use newly lib dbusutil + * refactor(appearance): use newly lib dbusutil + * fix(network): allow to delete when creating connection + * fix(network): fix device mac address unchanged after set it to empty + * refactor(keybinding): use newly lib dbusutil + * fix(network): filter notify if device disabled + * refactor(mime): use newly lib dbusutil + * refactor(timedate): use newly lib dbusutil + * refactor(screenedge): use newly lib dbusutil + * refactor(sessionwatcher): use newly lib dbusutil + * refactor(systeminfo): use newly lib dbusutil + * refactor(screensaver): use newly lib dbusutil + * refactor(session/power): use lib dbusutil + * chore: use lib dbusutil new api + * auto sync po files from transifex + * refactor(dock): optimize design + * fix(accounts): replace plaintext with ciphertext when set passwd + * fix(system-daemon): missing the method ScalePlymouth + * chore: only enable systemd service + * fix(lockservice): fix event crash after the frequent unlocking + * feat(session-init): use newly lib dbusutil + * refactor: remove dbusutil.PropsMaster + * feat(network): add l2tp ipsec ike/esp settings + * Revert "feat(session/power): set dpms off before suspend" + * auto sync po files from transifex + * fix(network): fix add connection failed if no activated + * fix(network): correct wired ip unavailable notification + * feat: make calltrace as module + * feat(system-daemon): use newly lib dbusutil + * fix(default-terminal): can not handle the -e option + * feat(langselector): replace PropsMu with PropsMaster + * feat(grub2): replace PropsMu with PropsMaster + * fix(timedate): fix polkit message untranslated + * fix: optimize channel statements + * feat(swapsched): add blkio controller + * feat(dock): window flash supported + * refactor(debug): watch cpu/mem anormaly + * fix(soundeffect): property name Enabled typo + * feat(soundeffect): use newly lib dbusutil + * feat(search): use newly lib dbusutil + * feat(langselector): use newly lib dbusutil + * feat(grub2): use newly lib dbusutil + * feat(dde-lockservice): use newly lib dbusutil + * feat(dde-greeter-setter): use newly lib dbusutil + * feat(`backlight_helper`): use newly lib dbusutil + * feat: add calltrace to dump runtime stack + * chore(translations): update translation source + * chore(accounts): correct policy translations + * chore: correct network translations + * chore: update license + * chore: add accounts systemd service file + * chore: move bluez and fprintd to optional dependencies + * feat(trayicon): merge damage notify events + * fix(session/power): method StartupNotify appears in the DBus interface + * fix(accounts): change user config path + * feat: use new lib gsettings + * feat(keybinding): regrabAll only after keyboard layout changed + * fix(dock): dock not show if launcher shown + * fix: optimize appearance gsettings signal + * refactor(accounts): elaborate login related action + * feat(accounts): improve user auth action + * fix: terminal opened by dde-file-manager work dir is wrong + * feat: use tool deepin-policy-ts-convert to handle the + * docs: `add service_trigger.md` + * feat: dde-session-daemon add new module `service_trigger` + +------------------------------------------------------------------- +Fri Mar 2 03:29:08 UTC 2018 - hillwood@opensuse.org + +- Update version to 3.2.9 + * Add some moudles + * Features update + * Fix bugs + ------------------------------------------------------------------- Tue Dec 5 07:21:12 UTC 2017 - hillwood@opensuse.org @@ -69,8 +459,8 @@ Thu Nov 30 06:51:10 UTC 2017 - hillwood@opensuse.org ------------------------------------------------------------------- Wed Nov 15 12:21:47 UTC 2017 - hillwood@opensuse.org -- Add deepin-daemon-fix-wrong-policy-settings.patch - * Fix wrong policyconfig settings +- Add deepin-daemon-fix-policy-settings.patch + * Fix policy settings - Cleanup spec - Split language package. diff --git a/deepin-daemon.spec b/deepin-daemon.spec index 76d0b65..ac5202b 100644 --- a/deepin-daemon.spec +++ b/deepin-daemon.spec @@ -15,10 +15,11 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -%define _name dde-daemon +%define _name dde-daemon +%define import_path pkg.deepin.io/dde/daemon Name: deepin-daemon -Version: 3.2.7 +Version: 3.27.0 Release: 0 Summary: Daemon handling the DDE session settings License: GPL-3.0+ @@ -26,16 +27,20 @@ URL: https://github.com/linuxdeepin/dde-daemon Source0: https://github.com/linuxdeepin/dde-daemon/archive/%{version}/%{_name}-%{version}.tar.gz Source1: %{name}.sysusers Source99: %{name}-rpmlintrc -# PATCH-FIX-UPSTREAM deepin-daemon-fix-wrong-policy-settings.patch hillwood@opensuse.org - Fix wrong policyconfig settings. -Patch0: %{name}-fix-wrong-policy-settings.patch +# PATCH-FIX-UPSTREAM deepin-daemon-fix-policy-settings.patch +# hillwood@opensuse.org - Fix policy settings. +Patch0: %{name}-fix-policy-settings.patch # PATCH-FIX-OPENSUSE deepin-daemon-libinput.patch.patch hillwood@opensuse.org - Fix build on libinput. Patch1: %{name}-libinput.patch +# PATCH-FIX-OPENSUSE disable-gobuild-in-makefile.patch hillwood@opensuse.org +# Use gobuild macro instead of makefile to build go binaries +Patch2: disable-gobuild-in-makefile.patch Group: System/GUI/Other BuildRequires: golang-packaging BuildRequires: deepin-gettext-tools -BuildRequires: golang-gir-generator BuildRequires: fontpackages-devel BuildRequires: pam-devel +BuildRequires: pkgconfig(alsa) BuildRequires: pkgconfig(fontconfig) BuildRequires: pkgconfig(gnome-keyring-1) BuildRequires: pkgconfig(gdk-pixbuf-xlib-2.0) @@ -43,6 +48,8 @@ BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(gio-2.0) BuildRequires: pkgconfig(libbamf3) BuildRequires: pkgconfig(libcanberra) +BuildRequires: pkgconfig(libnl-3.0) +BuildRequires: pkgconfig(libnl-genl-3.0) BuildRequires: pkgconfig(libpulse) BuildRequires: pkgconfig(libsystemd) BuildRequires: pkgconfig(libudev) @@ -56,26 +63,70 @@ BuildRequires: pkgconfig(xtst) BuildRequires: pkgconfig(xcursor) BuildRequires: pkgconfig(xfixes) BuildRequires: pkgconfig(xkbfile) -BuildRequires: pkgconfig(libnl-3.0) -BuildRequires: pkgconfig(libnl-genl-3.0) -BuildRequires: golang-dbus-factory >= 3.1.9 -BuildRequires: golang-go-lib -BuildRequires: golang-deepin-api-source -BuildRequires: golang-github-linuxdeepin-go-x11-client -BuildRequires: golang-github-burntsushi-xgb -BuildRequires: golang-github-burntsushi-xgbutil -BuildRequires: golang-github-axgle-mahonia -BuildRequires: golang-github-msteinert-pam -BuildRequires: golang-github-nfnt-resize -BuildRequires: golang-github-alecthomas-kingpin -BuildRequires: golang-gopkgin-yaml -BuildRequires: golang-org-x-tools -BuildRequires: golang-org-x-text >= 1.5.2+git20161209 -BuildRequires: golang-org-x-net +BuildRequires: golang(github.com/linuxdeepin/go-dbus-factory/org.freedesktop.policykit1) +BuildRequires: golang(github.com/linuxdeepin/go-dbus-factory/org.freedesktop.login1) +BuildRequires: golang(github.com/linuxdeepin/go-dbus-factory/com.deepin.daemon.accounts) +BuildRequires: golang(github.com/linuxdeepin/go-dbus-factory/com.deepin.sessionmanager) +BuildRequires: golang(github.com/linuxdeepin/go-dbus-factory/com.deepin.wm) +BuildRequires: golang(github.com/linuxdeepin/go-dbus-factory/com.deepin.api.cursorhelper) +BuildRequires: golang(github.com/linuxdeepin/go-dbus-factory/com.deepin.api.soundthemeplayer) +BuildRequires: golang(github.com/linuxdeepin/go-dbus-factory/org.freedesktop.dbus) +BuildRequires: golang(github.com/linuxdeepin/go-dbus-factory/org.mpris.mediaplayer2) +BuildRequires: golang(github.com/linuxdeepin/go-dbus-factory/net.reactivated.fprint) +BuildRequires: golang(github.com/linuxdeepin/go-dbus-factory/com.deepin.api.device) +BuildRequires: golang(github.com/linuxdeepin/go-dbus-factory/org.bluez) +BuildRequires: golang(github.com/linuxdeepin/go-dbus-factory/com.deepin.daemon.apps) +BuildRequires: golang(github.com/linuxdeepin/go-dbus-factory/com.deepin.dde.daemon.launcher) +BuildRequires: golang(github.com/linuxdeepin/go-dbus-factory/com.deepin.dde.launcher) +BuildRequires: golang(github.com/linuxdeepin/go-dbus-factory/com.deepin.daemon.daemon) +BuildRequires: golang(github.com/linuxdeepin/go-dbus-factory/com.deepin.daemon.gesture) +BuildRequires: golang(github.com/linuxdeepin/go-dbus-factory/org.freedesktop.notifications) +BuildRequires: golang(github.com/linuxdeepin/go-dbus-factory/com.deepin.daemon.audio) +BuildRequires: golang(github.com/linuxdeepin/go-dbus-factory/com.deepin.daemon.display) +BuildRequires: golang(github.com/linuxdeepin/go-dbus-factory/com.deepin.daemon.helper.backlight) +BuildRequires: golang(github.com/linuxdeepin/go-dbus-factory/com.deepin.daemon.inputdevices) +BuildRequires: golang(github.com/linuxdeepin/go-dbus-factory/com.deepin.api.localehelper) +BuildRequires: golang(github.com/linuxdeepin/go-dbus-factory/com.deepin.daemon.network) +BuildRequires: golang(github.com/linuxdeepin/go-dbus-factory/com.deepin.lastore) +BuildRequires: golang(github.com/linuxdeepin/go-dbus-factory/com.deepin.system.power) +BuildRequires: golang(github.com/linuxdeepin/go-dbus-factory/com.deepin.api.pinyin) +BuildRequires: golang(github.com/linuxdeepin/go-dbus-factory/org.freedesktop.miracle.wfd) +BuildRequires: golang(github.com/linuxdeepin/go-dbus-factory/org.freedesktop.miracle.wifi) +BuildRequires: golang(github.com/linuxdeepin/go-dbus-factory/org.freedesktop.networkmanager) +BuildRequires: golang(github.com/linuxdeepin/go-dbus-factory/com.deepin.system.network) +BuildRequires: golang(github.com/linuxdeepin/go-dbus-factory/org.freedesktop.modemmanager1) +BuildRequires: golang(github.com/linuxdeepin/go-dbus-factory/org.freedesktop.secrets) +BuildRequires: golang(github.com/linuxdeepin/go-dbus-factory/com.deepin.daemon.sessionwatcher) +BuildRequires: golang(github.com/linuxdeepin/go-dbus-factory/net.hadess.sensorproxy) +BuildRequires: golang(github.com/linuxdeepin/go-dbus-factory/org.freedesktop.screensaver) +BuildRequires: golang(github.com/linuxdeepin/go-dbus-factory/org.freedesktop.timedate1) +BuildRequires: golang(github.com/linuxdeepin/go-dbus-factory/org.freedesktop.udisks2) +BuildRequires: golang(github.com/linuxdeepin/go-dbus-factory/com.deepin.daemon.timedated) +BuildRequires: golang(pkg.deepin.io/dde/api/lang_info) +BuildRequires: golang(pkg.deepin.io/dde/api/theme_thumb) +BuildRequires: golang(pkg.deepin.io/dde/api/themes) +BuildRequires: golang(pkg.deepin.io/dde/api/soundutils) +BuildRequires: golang(pkg.deepin.io/dde/api/session) +BuildRequires: golang(pkg.deepin.io/dde/api/userenv) +BuildRequires: golang(pkg.deepin.io/dde/api/thumbnails/cursor) +BuildRequires: golang(pkg.deepin.io/dde/api/thumbnails/gtk) +BuildRequires: golang(pkg.deepin.io/dde/api/thumbnails/icon) +BuildRequires: golang(pkg.deepin.io/dde/api/thumbnails/images) +BuildRequires: golang(pkg.deepin.io/dde/api/drandr) +BuildRequires: golang(pkg.deepin.io/dde/api/dxinput) +BuildRequires: golang(pkg.deepin.io/dde/api/dxinput/utils) +BuildRequires: golang(pkg.deepin.io/dde/api/language_support) +BuildRequires: golang(pkg.deepin.io/dde/api/powersupply/battery) +BuildRequires: golang(pkg.deepin.io/dde/api/powersupply) +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: rsvg-view +BuildRequires: systemd Requires: deepin-desktop-base Requires: deepin-desktop-schemas -Requires: deepin-notifications +Requires: deepin-osd Requires: deepin-polkit-agent Requires: acpid Requires: gvfs @@ -83,40 +134,116 @@ Requires: iw Requires: rfkill Requires: upower Requires: xdotool -Requires: systemd -Recommends: %{name}-lang = {version} -Recommends: NetworkManager-vpnc-gnome -Recommends: NetworkManager-pptp-gnome -Recommends: NetworkManager-l2tp-gnome -Recommends: NetworkManager-strongswan-gnome -Recommends: NetworkManager-openvpn-gnome -Recommends: NetworkManager-openconnect-gnome +Requires: wallpaper-branding-openSUSE +Recommends: %{name}-lang = %{version} Recommends: iso-codes Recommends: mobile-broadband-provider-info +AutoReqProv: Off BuildRoot: %{_tmppath}/%{name}-%{version}-build +%{?systemd_requires} %description Deepin Daemon is a daemon for handling the deepin session settings +%package -n golang-github-linuxdeepin-deepin-daemon +Summary: Deepin daemon golang codes +Group: Development/Languages/Golang +Requires: golang(github.com/linuxdeepin/go-dbus-factory/org.freedesktop.policykit1) +Requires: golang(github.com/linuxdeepin/go-dbus-factory/org.freedesktop.login1) +Requires: golang(github.com/linuxdeepin/go-dbus-factory/com.deepin.daemon.accounts) +Requires: golang(github.com/linuxdeepin/go-dbus-factory/com.deepin.sessionmanager) +Requires: golang(github.com/linuxdeepin/go-dbus-factory/com.deepin.wm) +Requires: golang(github.com/linuxdeepin/go-dbus-factory/com.deepin.api.cursorhelper) +Requires: golang(github.com/linuxdeepin/go-dbus-factory/com.deepin.api.soundthemeplayer) +Requires: golang(github.com/linuxdeepin/go-dbus-factory/org.freedesktop.dbus) +Requires: golang(github.com/linuxdeepin/go-dbus-factory/org.mpris.mediaplayer2) +Requires: golang(github.com/linuxdeepin/go-dbus-factory/net.reactivated.fprint) +Requires: golang(github.com/linuxdeepin/go-dbus-factory/com.deepin.api.device) +Requires: golang(github.com/linuxdeepin/go-dbus-factory/org.bluez) +Requires: golang(github.com/linuxdeepin/go-dbus-factory/com.deepin.daemon.apps) +Requires: golang(github.com/linuxdeepin/go-dbus-factory/com.deepin.dde.daemon.launcher) +Requires: golang(github.com/linuxdeepin/go-dbus-factory/com.deepin.dde.launcher) +Requires: golang(github.com/linuxdeepin/go-dbus-factory/com.deepin.daemon.daemon) +Requires: golang(github.com/linuxdeepin/go-dbus-factory/com.deepin.daemon.gesture) +Requires: golang(github.com/linuxdeepin/go-dbus-factory/org.freedesktop.notifications) +Requires: golang(github.com/linuxdeepin/go-dbus-factory/com.deepin.daemon.audio) +Requires: golang(github.com/linuxdeepin/go-dbus-factory/com.deepin.daemon.display) +Requires: golang(github.com/linuxdeepin/go-dbus-factory/com.deepin.daemon.helper.backlight) +Requires: golang(github.com/linuxdeepin/go-dbus-factory/com.deepin.daemon.inputdevices) +Requires: golang(github.com/linuxdeepin/go-dbus-factory/com.deepin.api.localehelper) +Requires: golang(github.com/linuxdeepin/go-dbus-factory/com.deepin.daemon.network) +Requires: golang(github.com/linuxdeepin/go-dbus-factory/com.deepin.lastore) +Requires: golang(github.com/linuxdeepin/go-dbus-factory/com.deepin.system.power) +Requires: golang(github.com/linuxdeepin/go-dbus-factory/com.deepin.api.pinyin) +Requires: golang(github.com/linuxdeepin/go-dbus-factory/org.freedesktop.miracle.wfd) +Requires: golang(github.com/linuxdeepin/go-dbus-factory/org.freedesktop.miracle.wifi) +Requires: golang(github.com/linuxdeepin/go-dbus-factory/org.freedesktop.networkmanager) +Requires: golang(github.com/linuxdeepin/go-dbus-factory/com.deepin.system.network) +Requires: golang(github.com/linuxdeepin/go-dbus-factory/org.freedesktop.modemmanager1) +Requires: golang(github.com/linuxdeepin/go-dbus-factory/org.freedesktop.secrets) +Requires: golang(github.com/linuxdeepin/go-dbus-factory/com.deepin.daemon.sessionwatcher) +Requires: golang(github.com/linuxdeepin/go-dbus-factory/net.hadess.sensorproxy) +Requires: golang(github.com/linuxdeepin/go-dbus-factory/org.freedesktop.screensaver) +Requires: golang(github.com/linuxdeepin/go-dbus-factory/org.freedesktop.timedate1) +Requires: golang(github.com/linuxdeepin/go-dbus-factory/org.freedesktop.udisks2) +Requires: golang(github.com/linuxdeepin/go-dbus-factory/com.deepin.daemon.timedated) +Requires: golang(pkg.deepin.io/dde/api/lang_info) +Requires: golang(pkg.deepin.io/dde/api/theme_thumb) +Requires: golang(pkg.deepin.io/dde/api/themes) +Requires: golang(pkg.deepin.io/dde/api/soundutils) +Requires: golang(pkg.deepin.io/dde/api/session) +Requires: golang(pkg.deepin.io/dde/api/userenv) +Requires: golang(pkg.deepin.io/dde/api/thumbnails/cursor) +Requires: golang(pkg.deepin.io/dde/api/thumbnails/gtk) +Requires: golang(pkg.deepin.io/dde/api/thumbnails/icon) +Requires: golang(pkg.deepin.io/dde/api/thumbnails/images) +Requires: golang(pkg.deepin.io/dde/api/drandr) +Requires: golang(pkg.deepin.io/dde/api/dxinput) +Requires: golang(pkg.deepin.io/dde/api/dxinput/utils) +Requires: golang(pkg.deepin.io/dde/api/language_support) +Requires: golang(pkg.deepin.io/dde/api/powersupply/battery) +Requires: golang(pkg.deepin.io/dde/api/powersupply) +Requires: golang(github.com/msteinert/pam) +Requires: golang(github.com/axgle/mahonia) +Requires: golang(gopkg.in/yaml.v2) +Requires: golang(github.com/gosexy/gettext) +BuildArch: noarch +AutoReqProv: On +%{go_provides} + +%description -n golang-github-linuxdeepin-deepin-daemon +This package contains library source intended forbuilding other packages which +use import path with pkg.deepin.io/dde/daemon prefix. + %lang_package %prep %setup -q -n %{_name}-%{version} %patch0 -p1 %patch1 -p1 +%patch2 -p1 + +sed -i '/systemd/s|lib|usr/lib|' Makefile +sed -i 's|lib/NetworkManager|lib|' network/utils_test.go -# Fix library exec path -sed -i '/ldflags/d' Makefile # Fix grub.cfg path and don't change openSUSE default grub2 theme -sed -i 's|boot/grub/deepin|boot/grub2/openSUSE|' grub2/{theme,log,entry,config}.go +sed -i 's|boot/grub/deepin|boot/grub2/openSUSE|' grub2/*.go sed -i 's|/usr/share/backgrounds/default_background.jpg|/usr/share/wallpapers/openSUSEdefault/contents/images/1920x1080.jpg|' accounts/user.go %build +%goprep %{import_path} +%gobuild ... make %{?_smp_mflags} %install +%goinstall +%gosrc %make_install +pushd %{buildroot}%{_libexecdir}/deepin-daemon + ln -s ../../bin/* . +popd +%gofilelist install -Dm644 %{S:1} %{buildroot}%{_libexecdir}/sysusers.d/deepin-daemon.conf @@ -128,9 +255,16 @@ HandlePowerKey=ignore HandleSuspendKey=ignore EOF +install -d %{buildroot}%{_sbindir} +ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rcdeepin-accounts-daemon + %find_lang %{_name} +%pre +%service_add_pre deepin-accounts-daemon.service + %post +%service_add_post deepin-accounts-daemon.service if [ $1 -ge 1 ]; then %sysusers_create deepin-daemon.conf %{_sbindir}/alternatives --install %{_bindir}/x-terminal-emulator \ @@ -138,12 +272,14 @@ if [ $1 -ge 1 ]; then fi %preun +%service_del_preun deepin-accounts-daemon.service if [ $1 -eq 0 ]; then %{_sbindir}/alternatives --remove x-terminal-emulator \ %{_libexecdir}/%{name}/default-terminal fi %postun +%service_del_postun deepin-accounts-daemon.service if [ $1 -eq 0 ]; then rm -f /var/cache/deepin/mark-setup-network-services rm -f /var/log/deepin.log @@ -151,7 +287,14 @@ fi %files %defattr(-,root,root,-) -%doc README.md LICENSE +%doc README.md +%license LICENSE +%{_bindir}/* +%dir %{_sysconfdir}/default/grub.d +%config %{_sysconfdir}/default/grub.d/10_deepin.cfg +%config %{_sysconfdir}/pam.d/deepin-auth-keyboard +%dir %{_sysconfdir}/grub.d +%{_sysconfdir}/grub.d/35_deepin_gfxmode %{_libexecdir}/%{name}/ %dir %{_sysusersdir} %{_sysusersdir}/%{name}.conf @@ -167,7 +310,19 @@ fi %dir %{_datadir}/polkit-1/actions %{_datadir}/polkit-1/actions/*.policy %{_datadir}/icons/hicolor/*/status/* -%{_var}/cache/appearance/ +%dir %{_datadir}/pam-configs +%{_datadir}/pam-configs/deepin-auth +/var/cache/appearance/ +%{_unitdir}/deepin-accounts-daemon.service +%{_sbindir}/rcdeepin-accounts-daemon +%dir /var/lib/polkit-1 +%dir /var/lib/polkit-1/localauthority +%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.Grub2.pkla + +%files -n golang-github-linuxdeepin-deepin-daemon -f file.lst +%defattr(-,root,root,-) %files lang -f %{_name}.lang diff --git a/disable-gobuild-in-makefile.patch b/disable-gobuild-in-makefile.patch new file mode 100644 index 0000000..50ed554 --- /dev/null +++ b/disable-gobuild-in-makefile.patch @@ -0,0 +1,39 @@ +diff -Nur dde-daemon-3.25.2/Makefile dde-daemon-3.25.2-new/Makefile +--- dde-daemon-3.25.2/Makefile 2019-04-10 11:49:27.000000000 +0800 ++++ dde-daemon-3.25.2-new/Makefile 2019-04-14 15:44:25.339116300 +0800 +@@ -4,7 +4,7 @@ + GOBUILD = go build + + BINARIES = \ +- dde-session-daemon \ ++# dde-session-daemon \ + dde-system-daemon \ + grub2 \ + search \ +@@ -15,7 +15,7 @@ + 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 @@ + fi + + out/bin/%: +- 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 @@ + 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-file-manager out/bin/desktop-toggle $(addprefix out/bin/, ${BINARIES}) ts_to_policy + + test: prepare + env GOPATH="${GOPATH}:${CURDIR}/${GOPATH_DIR}" go test -v ./...