From 13e6b7a6c92aa11991860edd003ecb38ab2a8e88 Mon Sep 17 00:00:00 2001 From: liweiganga Date: Thu, 10 Feb 2022 13:22:18 +0800 Subject: [PATCH 1/2] fix build error --- dde-daemon.spec | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/dde-daemon.spec b/dde-daemon.spec index 981a5f8..8570c2a 100644 --- a/dde-daemon.spec +++ b/dde-daemon.spec @@ -12,12 +12,12 @@ Name: dde-daemon Version: 5.12.0.18 -Release: 3 +Release: 4 Summary: Daemon handling the DDE session settings License: GPLv3 URL: http://shuttle.corp.deepin.com/cache/tasks/18802/unstable-amd64/ Source0: %{name}-%{version}.orig.tar.xz -Source1: vendor.tar.gz +Source1: vendor.tar.gz BuildRequires: python3 @@ -33,8 +33,7 @@ BuildRequires: systemd-devel BuildRequires: alsa-lib-devel BuildRequires: alsa-lib BuildRequires: pulseaudio-libs-devel -BuildRequires: gdk-pixbuf2-xlib-devel -BuildRequires: gdk-pixbuf2-xlib +BuildRequires: gdk-pixbuf-xlib BuildRequires: libnl3-devel BuildRequires: libnl3 BuildRequires: libgudev-devel @@ -48,7 +47,7 @@ BuildRequires: pkgconfig(sqlite3) Requires: bluez-libs Requires: deepin-desktop-base -Suggests: deepin-desktop-server +Suggests: deepin-desktop-server Requires: deepin-desktop-schemas Requires: dde-session-ui Requires: dde-polkit-agent @@ -110,6 +109,7 @@ EOF # Replace reference of google-chrome to chromium-browser sed -i 's/google-chrome/chromium-browser/g' misc/dde-daemon/mime/data.json +go env -w GO111MODULE=auto %build BUILDID="0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \n')" @@ -180,6 +180,9 @@ fi /lib/systemd/system/deepin-accounts-daemon.service %changelog +* Thu Feb 10 2022 liweigang - 5.12.0.18-4 +- fix build error and format spec. + * Thu Aug 26 2021 heyitao - 5.12.0.18-3 - Update vendor.tag.gz. -- Gitee From 4592674508ef25706d9625a817751cf75d5f890b Mon Sep 17 00:00:00 2001 From: liweigang Date: Tue, 8 Mar 2022 14:51:34 +0800 Subject: [PATCH 2/2] fix install --- dde-daemon.spec | 9 ++++++++- deepin-daemon.sysusers | 2 ++ 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 deepin-daemon.sysusers diff --git a/dde-daemon.spec b/dde-daemon.spec index 8570c2a..34b4979 100644 --- a/dde-daemon.spec +++ b/dde-daemon.spec @@ -12,12 +12,13 @@ Name: dde-daemon Version: 5.12.0.18 -Release: 4 +Release: 5 Summary: Daemon handling the DDE session settings License: GPLv3 URL: http://shuttle.corp.deepin.com/cache/tasks/18802/unstable-amd64/ Source0: %{name}-%{version}.orig.tar.xz Source1: vendor.tar.gz +Source2: %{sname}.sysusers BuildRequires: python3 @@ -122,6 +123,8 @@ BUILDID="0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \n')" export GOPATH=/usr/share/gocode %make_install PAM_MODULE_DIR=%{_libdir}/security GOBUILD="go build -compiler gc -ldflags \"-B $BUILDID\"" +install -Dm644 %{SOURCE2} %{buildroot}/usr/lib/sysusers.d/%{sname}.conf + # fix systemd/logind config install -d %{buildroot}/usr/lib/systemd/logind.conf.d/ cat > %{buildroot}/usr/lib/systemd/logind.conf.d/10-%{sname}.conf < - 5.12.0.18-5 +- fix install warning + * Thu Feb 10 2022 liweigang - 5.12.0.18-4 - fix build error and format spec. diff --git a/deepin-daemon.sysusers b/deepin-daemon.sysusers new file mode 100644 index 0000000..a676087 --- /dev/null +++ b/deepin-daemon.sysusers @@ -0,0 +1,2 @@ +u deepin-daemon - "Deepin Daemon" +g deepin-daemon - -- Gitee