From b0b9edd09b333dae7bd6ed01e4f307dea1677e3047b0df28f16b18c3af3f3ab6 Mon Sep 17 00:00:00 2001 From: Hillwood Yang Date: Sat, 8 May 2021 13:25:49 +0000 Subject: [PATCH 1/2] Accepting request 891475 from X11:Deepin:Factory - Update version to 5.13.10 * Disble bluetooth by default * Disble calender service * Fix save password on WIFI setting * Update call power button on dde-lock * Fix bluetooth connecting status - Fix build on Leap 15.3 OBS-URL: https://build.opensuse.org/request/show/891475 OBS-URL: https://build.opensuse.org/package/show/X11:Deepin/deepin-daemon?expand=0&rev=12 --- dde-daemon-5.13.10.tar.gz | 3 +++ dde-daemon-5.13.6.tar.gz | 3 --- deepin-daemon.changes | 15 +++++++++++++++ deepin-daemon.spec | 9 +++++---- 4 files changed, 23 insertions(+), 7 deletions(-) create mode 100644 dde-daemon-5.13.10.tar.gz delete mode 100644 dde-daemon-5.13.6.tar.gz diff --git a/dde-daemon-5.13.10.tar.gz b/dde-daemon-5.13.10.tar.gz new file mode 100644 index 0000000..529df60 --- /dev/null +++ b/dde-daemon-5.13.10.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4e78c911628090c7bf5370355d5eaee7867996adea70602fd1ca57e00b3a9a3a +size 3278693 diff --git a/dde-daemon-5.13.6.tar.gz b/dde-daemon-5.13.6.tar.gz deleted file mode 100644 index 9771321..0000000 --- a/dde-daemon-5.13.6.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f79d27f67f94df0e2a3a7b06328355d0e87c02847bcec45a8b3597a950265440 -size 3279753 diff --git a/deepin-daemon.changes b/deepin-daemon.changes index 1e61ec5..0f79023 100644 --- a/deepin-daemon.changes +++ b/deepin-daemon.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Sat May 1 13:46:23 UTC 2021 - Hillwood Yang + +- Update version to 5.13.10 + * Disble bluetooth by default + * Disble calender service + * Fix save password on WIFI setting + * Update call power button on dde-lock + * Fix bluetooth connecting status + +------------------------------------------------------------------- +Sun Apr 25 13:59:32 UTC 2021 - Hillwood Yang + +- Fix build on Leap 15.3 + ------------------------------------------------------------------- Fri Mar 12 13:14:57 UTC 2021 - Hillwood Yang diff --git a/deepin-daemon.spec b/deepin-daemon.spec index 1ba3f25..b730560 100644 --- a/deepin-daemon.spec +++ b/deepin-daemon.spec @@ -19,7 +19,7 @@ %define import_path pkg.deepin.io/dde/daemon Name: deepin-daemon -Version: 5.13.6 +Version: 5.13.10 Release: 0 Summary: Daemon handling the DDE session settings License: GPL-3.0+ @@ -70,7 +70,7 @@ BuildRequires: pkgconfig(xfixes) BuildRequires: pkgconfig(xkbfile) BuildRequires: golang-github-linuxdeepin-go-dbus-factory BuildRequires: golang-github-linuxdeepin-dde-api -%if 0%{?suse_version} <= 1500 +%if 0%{?sle_version} == 150200 BuildRequires: golang-github-stretchr-testify %endif %if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150200 @@ -163,7 +163,7 @@ Provides translations for the "%{name}" package. %prep %autosetup -p1 -a2 -n %{_name}-%{version} -%if 0%{?suse_version} <= 1500 +%if 0%{?sle_version} == 150200 rm -rf vendor/github.com/stretchr/testify/ %endif mkdir -p $HOME/rpmbuild/BUILD/go/src/ @@ -192,10 +192,10 @@ rm -rf $HOME/rpmbuild/BUILD/go/src/github.com \ %goinstall %gosrc %make_install +%gofilelist pushd %{buildroot}%{_prefix}/lib/deepin-daemon ln -s ../../bin/* . popd -%gofilelist install -Dm644 %{SOURCE1} %{buildroot}%{_prefix}/lib/sysusers.d/deepin-daemon.conf install -Dm755 %{SOURCE3} %{buildroot}%{_bindir}/%{name}-dbus-installer @@ -329,3 +329,4 @@ fi %files lang -f %{_name}.lang %changelog + From 539f88b362f5b9acfe0f345e47a7f598e2993e00e659f1a6258923d8a7413b02 Mon Sep 17 00:00:00 2001 From: Hillwood Yang Date: Sat, 22 May 2021 12:34:48 +0000 Subject: [PATCH 2/2] Accepting request 894959 from X11:Deepin:Factory - Keep golang version on 1.15 on Tumbleweed, the project does not support golang 1.16+ OBS-URL: https://build.opensuse.org/request/show/894959 OBS-URL: https://build.opensuse.org/package/show/X11:Deepin/deepin-daemon?expand=0&rev=13 --- deepin-daemon.changes | 6 ++++++ deepin-daemon.spec | 4 +++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/deepin-daemon.changes b/deepin-daemon.changes index 0f79023..c909f56 100644 --- a/deepin-daemon.changes +++ b/deepin-daemon.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat May 22 11:53:04 UTC 2021 - Hillwood Yang + +- Keep golang version on 1.15 on Tumbleweed, the project does not support + golang 1.16+ + ------------------------------------------------------------------- Sat May 1 13:46:23 UTC 2021 - Hillwood Yang diff --git a/deepin-daemon.spec b/deepin-daemon.spec index b730560..0b03d72 100644 --- a/deepin-daemon.spec +++ b/deepin-daemon.spec @@ -40,7 +40,9 @@ Patch1: %{name}-libinput.patch Patch2: disable-gobuild-in-makefile.patch Patch3: xvfb-run.patch Group: System/GUI/Other -# BuildRequires: golang(API) = 1.11 +%if 0%{?suse_version} > 1500 +BuildRequires: golang(API) = 1.15 +%endif BuildRequires: golang-packaging BuildRequires: deepin-gettext-tools BuildRequires: fontpackages-devel