commit 092a23a80124e652ec0c8b2bc574ee8f3f07fd37b4e9d631986d5a6ea845ca1f Author: Hillwood Yang Date: Wed Nov 15 13:18:56 2017 +0000 Accepting request 542041 from home:hillwood:branches:X11:Deepin OBS-URL: https://build.opensuse.org/request/show/542041 OBS-URL: https://build.opensuse.org/package/show/X11:Deepin/deepin-daemon?expand=0&rev=1 diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..57affb6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.osc diff --git a/dde-daemon-3.2.0.tar.gz b/dde-daemon-3.2.0.tar.gz new file mode 100644 index 0000000..9ce3ddf --- /dev/null +++ b/dde-daemon-3.2.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:92d5a8c277df5611f9d2cbe69d290796e223bd0701ee2670aba7ede52458f655 +size 2649791 diff --git a/deepin-daemon-fix-wrong-policy-settings.patch b/deepin-daemon-fix-wrong-policy-settings.patch new file mode 100644 index 0000000..7538218 --- /dev/null +++ b/deepin-daemon-fix-wrong-policy-settings.patch @@ -0,0 +1,50 @@ +diff -Nur dde-daemon-3.2.0/misc/polkit-action/com.deepin.daemon.accounts.policy dde-daemon-3.2.0-new/misc/polkit-action/com.deepin.daemon.accounts.policy +--- dde-daemon-3.2.0/misc/polkit-action/com.deepin.daemon.accounts.policy 2017-10-12 11:03:49.000000000 +0800 ++++ dde-daemon-3.2.0-new/misc/polkit-action/com.deepin.daemon.accounts.policy 2017-11-15 20:20:28.927451700 +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.0/misc/polkit-action/com.deepin.daemon.Grub2.policy dde-daemon-3.2.0-new/misc/polkit-action/com.deepin.daemon.Grub2.policy +--- dde-daemon-3.2.0/misc/polkit-action/com.deepin.daemon.Grub2.policy 2017-10-12 11:03:49.000000000 +0800 ++++ dde-daemon-3.2.0-new/misc/polkit-action/com.deepin.daemon.Grub2.policy 2017-11-15 20:19:25.289418600 +0800 +@@ -10,8 +10,8 @@ + Change the grub2 configuration + 修改 Grub2 的配置 + +- no +- no ++ auth_admin ++ auth_admin + auth_admin_keep + + diff --git a/deepin-daemon-rpmlintrc b/deepin-daemon-rpmlintrc new file mode 100644 index 0000000..92fbe52 --- /dev/null +++ b/deepin-daemon-rpmlintrc @@ -0,0 +1,3 @@ +addFilter('suse-dbus-unauthorized-service') +setBadness('suse-dbus-unauthorized-service', 0) +setBadness('polkit-unauthorized-privilege', 0) diff --git a/deepin-daemon.changes b/deepin-daemon.changes new file mode 100644 index 0000000..3b45ce3 --- /dev/null +++ b/deepin-daemon.changes @@ -0,0 +1,12 @@ +------------------------------------------------------------------- +Wed Nov 15 12:21:47 UTC 2017 - hillwood@opensuse.org + +- Add deepin-daemon-fix-wrong-policy-settings.patch + * Fix wrong policyconfig settings +- Cleanup spec +- Split language package. + +------------------------------------------------------------------- +Tue Oct 3 15:29:45 UTC 2017 - sensor.wen@gmail.com + +- Initial package. diff --git a/deepin-daemon.spec b/deepin-daemon.spec new file mode 100644 index 0000000..42af00b --- /dev/null +++ b/deepin-daemon.spec @@ -0,0 +1,168 @@ +# +# spec file for package deepin-daemon +# +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + +%define _name dde-daemon + +Name: deepin-daemon +Version: 3.2.0 +Release: 0 +Summary: Daemon handling the DDE session settings +License: GPL-3.0+ +URL: https://github.com/linuxdeepin/dde-daemon +Source0: https://github.com/linuxdeepin/dde-daemon/archive/%{version}/%{_name}-%{version}.tar.gz +Source1: %{name}.sysusers +# PATCH-FIX-UPSTREAM deepin-daemon-fix-wrong-policy-settings.patch hillwood@opensuse.org - Fix wrong policyconfig settings. +Source99: %{name}-rpmlintrc +Patch0: %{name}-fix-wrong-policy-settings.patch +Group: System/GUI/Other +BuildRequires: golang-packaging +BuildRequires: gettext +BuildRequires: golang-gir-generator +BuildRequires: fontpackages-devel +BuildRequires: pam-devel +BuildRequires: pkgconfig(fontconfig) +BuildRequires: pkgconfig(gnome-keyring-1) +BuildRequires: pkgconfig(gdk-pixbuf-xlib-2.0) +BuildRequires: pkgconfig(gtk+-3.0) +BuildRequires: pkgconfig(gio-2.0) +BuildRequires: pkgconfig(libbamf3) +BuildRequires: pkgconfig(libcanberra) +BuildRequires: pkgconfig(libpulse) +BuildRequires: pkgconfig(libsystemd) +BuildRequires: pkgconfig(libudev) +BuildRequires: pkgconfig(gudev-1.0) +BuildRequires: pkgconfig(librsvg-2.0) +BuildRequires: pkgconfig(libinput) +BuildRequires: pkgconfig(poppler-glib) +BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(xi) +BuildRequires: pkgconfig(xtst) +BuildRequires: pkgconfig(xcursor) +BuildRequires: pkgconfig(xfixes) +BuildRequires: pkgconfig(xkbfile) +BuildRequires: golang-dbus-factory +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 +BuildRequires: golang-org-x-net +Requires: deepin-desktop-base +Requires: deepin-desktop-schemas +Requires: deepin-notifications +Requires: deepin-polkit-agent +Requires: acpid +Requires: gvfs +Requires: iw +Requires: rfkill +Requires: upower +Requires: xdotool +Requires: systemd +Recommends: NetworkManager-vpnc-gnome +Recommends: NetworkManager-pptp-gnome +Recommends: NetworkManager-l2tp-gnome +Recommends: NetworkManager-strongswan-gnome +Recommends: NetworkManager-openvpn-gnome +Recommends: NetworkManager-openconnect-gnome +Recommends: iso-codes +Recommends: mobile-broadband-provider-info +Recommends: google-noto-mono-fonts +Recommends: google-noto-sans-fonts +BuildRoot: %{_tmppath}/%{name}-%{version}-build + +%description +Deepin Daemon is a daemon for handling the deepin session settings + +%lang_package + +%prep +%setup -q -n %{_name}-%{version} +%patch0 -p1 + +# Fix library exec path +sed -i '/ldflags/d' Makefile + +# Fix grub.cfg path +sed -i 's|boot/grub|boot/grub2|' grub2/{theme,log,entry,config}.go +sed -i 's|default_background.jpg|default.png|' accounts/user.go + +%build +make %{?_smp_mflags} + +%install +%make_install + +install -Dm644 %{S:1} %{buildroot}/usr/lib/sysusers.d/deepin-daemon.conf + +# fix systemd/logind config +install -d %{buildroot}/usr/lib/systemd/logind.conf.d/ +cat > %{buildroot}/usr/lib/systemd/logind.conf.d/10-%{name}.conf <