Accepting request 949791 from X11:Deepin:Factory
- Update version to 5.13.97 * Update translations * Add login reminder port * Fix bugs * New feature: global shortcut for search - Drop harden_hwclock_stop.service.patch - Fix build on Leap 15.4+ - Update version to 5.13.78 * new dependence libnss-myhostname * Fix bugs - Update version to 5.13.49 * Add xsettings config * Drop hwclock_stop.service * Fix bugs OBS-URL: https://build.opensuse.org/request/show/949791 OBS-URL: https://build.opensuse.org/package/show/X11:Deepin/deepin-daemon?expand=0&rev=24
This commit is contained in:
Hillwood Yang
Git OBS Bridge
parent
dd8e17fe94
commit
bc8be4915f
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:31bc08a384fe1662fbd415d98a9a5bc7b34105eac2d61d47456a4b1de80287b4
|
||||
size 3299601
|
||||
3
dde-daemon-5.13.97.tar.gz
Normal file
3
dde-daemon-5.13.97.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:c2253f7144984e548f00fa7371228e0be5dc1489da79ed1339ac2065d13a6a9f
|
||||
size 3315954
|
||||
@ -10,6 +10,36 @@ Wed Jan 19 11:41:16 UTC 2022 - Dominique Leuenberger <dimstar@opensuse.org>
|
||||
- BuildRequire pkgconfig(systemd) instead of systemd: allowOBS to
|
||||
shortcut through systemd-mini.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Dec 16 05:56:56 UTC 2021 - Hillwood Yang <hillwood@opensuse.org>
|
||||
|
||||
- Update version to 5.13.97
|
||||
* Update translations
|
||||
* Add login reminder port
|
||||
* Fix bugs
|
||||
* New feature: global shortcut for search
|
||||
- Drop harden_hwclock_stop.service.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Oct 27 13:35:49 UTC 2021 - Hillwood Yang <hillwood@opensuse.org>
|
||||
|
||||
- Fix build on Leap 15.4+
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Oct 24 03:20:56 UTC 2021 - Hillwood Yang <hillwood@opensuse.org>
|
||||
|
||||
- Update version to 5.13.78
|
||||
* new dependence libnss-myhostname
|
||||
* Fix bugs
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Sep 19 14:15:34 UTC 2021 - Hillwood Yang <hillwood@opensuse.org>
|
||||
|
||||
- Update version to 5.13.49
|
||||
* Add xsettings config
|
||||
* Drop hwclock_stop.service
|
||||
* Fix bugs
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Sep 3 07:04:36 UTC 2021 - Johannes Segitz <jsegitz@suse.com>
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package deepin-daemon
|
||||
#
|
||||
# Copyright (c) 2022 SUSE LLC
|
||||
# Copyright (c) 2021 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
|
||||
@ -12,19 +12,17 @@
|
||||
# license that conforms to the Open Source Definition (Version 1.9)
|
||||
# published by the Open Source Initiative.
|
||||
|
||||
# Please submit bugfixes or comments via https://bugs.opensuse.org/
|
||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
|
||||
%define _name dde-daemon
|
||||
%define import_path pkg.deepin.io/dde/daemon
|
||||
|
||||
Name: deepin-daemon
|
||||
Version: 5.13.36
|
||||
Version: 5.13.97
|
||||
Release: 0
|
||||
Summary: Daemon handling the DDE session settings
|
||||
License: GPL-3.0-or-later
|
||||
Group: System/GUI/Other
|
||||
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
|
||||
@ -44,39 +42,41 @@ Patch2: disable-gobuild-in-makefile.patch
|
||||
# https://github.com/linuxdeepin/dde-daemon/commit/1262c03c5e5b4771f04a73ee2c01e1490f4e96af
|
||||
Patch3: fix-login_defs-path.patch
|
||||
Patch4: harden_deepin-accounts-daemon.service.patch
|
||||
Patch5: harden_hwclock_stop.service.patch
|
||||
%if 0%{?suse_version} > 1500
|
||||
Group: System/GUI/Other
|
||||
%if 0%{?suse_version} > 1500 || 0%{?sle_version} > 150300
|
||||
BuildRequires: golang(API) = 1.15
|
||||
%endif
|
||||
BuildRequires: lightdm
|
||||
BuildRequires: lightdm-gtk-greeter
|
||||
BuildRequires: golang-packaging
|
||||
BuildRequires: deepin-gettext-tools
|
||||
BuildRequires: fontpackages-devel
|
||||
BuildRequires: golang-github-linuxdeepin-dde-api
|
||||
BuildRequires: golang-github-linuxdeepin-go-dbus-factory
|
||||
BuildRequires: golang-packaging
|
||||
BuildRequires: pam-devel
|
||||
BuildRequires: pkgconfig(alsa)
|
||||
BuildRequires: pkgconfig(fontconfig)
|
||||
BuildRequires: pkgconfig(gdk-pixbuf-xlib-2.0)
|
||||
BuildRequires: pkgconfig(gio-2.0)
|
||||
BuildRequires: pkgconfig(gnome-keyring-1)
|
||||
BuildRequires: pkgconfig(gdk-pixbuf-xlib-2.0)
|
||||
BuildRequires: pkgconfig(gtk+-3.0)
|
||||
BuildRequires: pkgconfig(gudev-1.0)
|
||||
BuildRequires: pkgconfig(gio-2.0)
|
||||
BuildRequires: pkgconfig(libbamf3)
|
||||
BuildRequires: pkgconfig(libcanberra)
|
||||
BuildRequires: pkgconfig(libinput)
|
||||
BuildRequires: pkgconfig(libnl-3.0)
|
||||
BuildRequires: pkgconfig(libnl-genl-3.0)
|
||||
BuildRequires: pkgconfig(libpulse)
|
||||
BuildRequires: pkgconfig(librsvg-2.0)
|
||||
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(xi)
|
||||
BuildRequires: pkgconfig(xkbfile)
|
||||
BuildRequires: pkgconfig(xtst)
|
||||
BuildRequires: golang-github-linuxdeepin-go-dbus-factory
|
||||
BuildRequires: golang-github-linuxdeepin-dde-api
|
||||
%if 0%{?sle_version} == 150200
|
||||
BuildRequires: golang-github-stretchr-testify
|
||||
%endif
|
||||
@ -85,17 +85,16 @@ BuildRequires: rsvg-convert
|
||||
%else
|
||||
BuildRequires: rsvg-view
|
||||
%endif
|
||||
BuildRequires: systemd-rpm-macros
|
||||
BuildRequires: pkgconfig(systemd)
|
||||
BuildRequires: systemd-rpm-macros
|
||||
Requires: acpid
|
||||
Requires: gvfs
|
||||
Requires: iw
|
||||
Requires: libqt5-qdbus
|
||||
Requires: rfkill
|
||||
Requires: upower
|
||||
Requires: wallpaper-branding-openSUSE
|
||||
Requires: xdotool
|
||||
Requires: xvfb-run
|
||||
Requires: wallpaper-branding-openSUSE
|
||||
%if %{suse_version} > 1500
|
||||
Requires: libgdk_pixbuf_xlib-2_0-0
|
||||
%else
|
||||
@ -113,7 +112,6 @@ Deepin Daemon is a daemon for handling the deepin session settings
|
||||
|
||||
%package polkit
|
||||
Summary: Deepin daemon polkit profiles
|
||||
Group: System/GUI/Other
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
BuildArch: noarch
|
||||
AutoReqProv: Off
|
||||
@ -125,7 +123,6 @@ them manually or use deepin-polkit-install package.
|
||||
|
||||
%package dbus
|
||||
Summary: Deepin daemon DBus profiles
|
||||
Group: System/GUI/Other
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
BuildArch: noarch
|
||||
AutoReqProv: Off
|
||||
@ -138,9 +135,10 @@ them manually or use deepin-dbus-install package.
|
||||
%package -n golang-github-linuxdeepin-deepin-daemon
|
||||
Summary: Deepin daemon golang codes
|
||||
Group: Development/Languages/Golang
|
||||
Requires: golang-github-linuxdeepin-dde-api
|
||||
Requires: golang-github-linuxdeepin-go-dbus-factory
|
||||
Requires: golang-github-linuxdeepin-dde-api
|
||||
BuildArch: noarch
|
||||
AutoReqProv: On
|
||||
AutoReq: Off
|
||||
%{go_provides}
|
||||
|
||||
@ -148,6 +146,16 @@ AutoReq: Off
|
||||
This package contains library source intended forbuilding other packages which
|
||||
use import path with pkg.deepin.io/dde/daemon prefix.
|
||||
|
||||
%package lightdm
|
||||
Summary: Deepin Desktop branding setting for lightdm
|
||||
Group: System/X11/Displaymanagers
|
||||
Requires: lightdm
|
||||
Requires: %{name} = %{version}
|
||||
AutoReqProv: Off
|
||||
|
||||
%description lightdm
|
||||
Deepin Desktop branding setting for lightdm
|
||||
|
||||
%package pam
|
||||
Summary: Deepin Keyring - PAM module
|
||||
Group: System/GUI/Other
|
||||
@ -206,6 +214,11 @@ rm -rf $HOME/rpmbuild/BUILD/go/src/github.com \
|
||||
%gofilelist
|
||||
pushd %{buildroot}%{_prefix}/lib/deepin-daemon
|
||||
ln -s ../../bin/* .
|
||||
%if 0%{?suse_version} > 1500
|
||||
mv %{buildroot}%{_libexecdir}/dde-daemon/keybinding .
|
||||
%else
|
||||
mv %{buildroot}%{_prefix}/libexec/dde-daemon/keybinding .
|
||||
%endif
|
||||
popd
|
||||
|
||||
install -Dm644 %{SOURCE1} %{buildroot}%{_prefix}/lib/sysusers.d/deepin-daemon.conf
|
||||
@ -245,10 +258,10 @@ popd
|
||||
%find_lang %{_name}
|
||||
|
||||
%pre
|
||||
%service_add_pre deepin-accounts-daemon.service hwclock_stop.service
|
||||
%service_add_pre deepin-accounts-daemon.service
|
||||
|
||||
%post
|
||||
%service_add_post deepin-accounts-daemon.service hwclock_stop.service
|
||||
%service_add_post deepin-accounts-daemon.service
|
||||
if [ $1 -ge 1 ]; then
|
||||
%sysusers_create deepin-daemon.conf
|
||||
%{_sbindir}/alternatives --install %{_bindir}/x-terminal-emulator \
|
||||
@ -256,14 +269,14 @@ if [ $1 -ge 1 ]; then
|
||||
fi
|
||||
|
||||
%preun
|
||||
%service_del_preun deepin-accounts-daemon.service hwclock_stop.service
|
||||
%service_del_preun deepin-accounts-daemon.service
|
||||
if [ $1 -eq 0 ]; then
|
||||
%{_sbindir}/alternatives --remove x-terminal-emulator \
|
||||
%{_prefix}/lib/%{name}/default-terminal
|
||||
fi
|
||||
|
||||
%postun
|
||||
%service_del_postun deepin-accounts-daemon.service hwclock_stop.service
|
||||
%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
|
||||
@ -288,7 +301,6 @@ fi
|
||||
# %{_prefix}/lib/modules-load.d/i2c_dev.conf
|
||||
%dir %{_sysconfdir}/pulse/daemon.conf.d
|
||||
%config %{_sysconfdir}/pulse/daemon.conf.d/10-deepin.conf
|
||||
%{_unitdir}/hwclock_stop.service
|
||||
%dir %{_sysconfdir}/grub.d
|
||||
%{_sysconfdir}/grub.d/35_deepin_gfxmode
|
||||
%{_prefix}/lib/%{name}/
|
||||
@ -303,19 +315,11 @@ fi
|
||||
%{_prefix}/lib/systemd/logind.conf.d/10-%{name}.conf
|
||||
%{_prefix}/lib/udev/rules.d/80-deepin-fprintd.rules
|
||||
%{_datadir}/dbus-1/services/*.service
|
||||
# %{_datadir}/dbus-1/system-services/*.service
|
||||
%dir %{_datadir}/dbus-1/system.d
|
||||
# %{_datadir}/dbus-1/system.d/*.conf
|
||||
%{_datadir}/%{_name}/
|
||||
%exclude %{_datadir}/%{_name}/*.tar.gz
|
||||
%{_datadir}/dde/
|
||||
# %dir %{_datadir}/polkit-1
|
||||
# %dir %{_datadir}/polkit-1/actions
|
||||
# %{_datadir}/polkit-1/actions/*.policy
|
||||
%{_datadir}/icons/hicolor/*/status/*
|
||||
# %dir %{_datadir}/pam-configs
|
||||
# %{_datadir}/pam-configs/deepin-auth
|
||||
# /var/cache/appearance/
|
||||
%{_unitdir}/deepin-accounts-daemon.service
|
||||
%{_sbindir}/rcdeepin-accounts-daemon
|
||||
%{_sbindir}/rchwclock_stop
|
||||
@ -324,6 +328,10 @@ fi
|
||||
%dir %{_var}/lib/polkit-1/localauthority/10-vendor.d
|
||||
%{_var}/lib/polkit-1/localauthority/10-vendor.d/com.deepin.daemon.*.pkla
|
||||
|
||||
%files lightdm
|
||||
%dir %{_sysconfdir}/lightdm/deepin
|
||||
%{_sysconfdir}/lightdm/deepin/xsettingsd.conf
|
||||
|
||||
%files -n golang-github-linuxdeepin-deepin-daemon -f file.lst
|
||||
%defattr(-,root,root,-)
|
||||
|
||||
@ -340,3 +348,4 @@ fi
|
||||
%files lang -f %{_name}.lang
|
||||
|
||||
%changelog
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
diff -Nur dde-daemon-5.12.52/Makefile dde-daemon-5.12.52-new/Makefile
|
||||
--- dde-daemon-5.12.52/Makefile 2021-01-06 14:30:57.000000000 +0800
|
||||
+++ dde-daemon-5.12.52-new/Makefile 2021-02-21 18:58:53.303974197 +0800
|
||||
diff -Nur dde-daemon-5.13.49/Makefile dde-daemon-5.13.49-new/Makefile
|
||||
--- dde-daemon-5.13.49/Makefile 2021-07-28 13:24:41.000000000 +0800
|
||||
+++ dde-daemon-5.13.49-new/Makefile 2021-09-19 21:34:31.739930665 +0800
|
||||
@@ -4,8 +4,8 @@
|
||||
GOBUILD = go build $(GO_BUILD_FLAGS)
|
||||
|
||||
@ -34,8 +34,8 @@ diff -Nur dde-daemon-5.12.52/Makefile dde-daemon-5.12.52-new/Makefile
|
||||
deepin-policy-ts-convert ts2policy misc/polkit-action/com.deepin.daemon.$$i.policy.in misc/ts/com.deepin.daemon.$$i.policy misc/polkit-action/com.deepin.daemon.$$i.policy; \
|
||||
done
|
||||
|
||||
-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
|
||||
-build: prepare out/bin/default-terminal out/bin/default-file-manager out/bin/desktop-toggle $(addprefix out/bin/, ${BINARIES}) ts_to_policy icons translate
|
||||
+build: prepare out/bin/default-file-manager out/bin/desktop-toggle $(addprefix out/bin/, ${BINARIES}) ts_to_policy icons translate
|
||||
|
||||
test: prepare
|
||||
env GOPATH="${CURDIR}/${GOPATH_DIR}:${GOPATH}" go test -v ./...
|
||||
|
||||
@ -1,23 +0,0 @@
|
||||
Index: dde-daemon-5.13.36/misc/systemd/services/hwclock_stop.service
|
||||
===================================================================
|
||||
--- dde-daemon-5.13.36.orig/misc/systemd/services/hwclock_stop.service
|
||||
+++ dde-daemon-5.13.36/misc/systemd/services/hwclock_stop.service
|
||||
@@ -3,6 +3,18 @@ Description=sync RTC from system time
|
||||
Before=shutdown.target
|
||||
|
||||
[Service]
|
||||
+# added automatically, for details please see
|
||||
+# https://en.opensuse.org/openSUSE:Security_Features#Systemd_hardening_effort
|
||||
+ProtectSystem=full
|
||||
+ProtectHome=true
|
||||
+PrivateDevices=true
|
||||
+ProtectHostname=true
|
||||
+ProtectKernelTunables=true
|
||||
+ProtectKernelModules=true
|
||||
+ProtectKernelLogs=true
|
||||
+ProtectControlGroups=true
|
||||
+RestrictRealtime=true
|
||||
+# end of automatic additions
|
||||
ExecStart=hwclock -s
|
||||
ExecStop=hwclock -w
|
||||
RemainAfterExit=yes
|
||||
Loading…
Reference in New Issue
Block a user