diff --git a/dde-daemon-5.13.97.tar.gz b/dde-daemon-5.13.97.tar.gz deleted file mode 100644 index 759c3dd..0000000 --- a/dde-daemon-5.13.97.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c2253f7144984e548f00fa7371228e0be5dc1489da79ed1339ac2065d13a6a9f -size 3315954 diff --git a/dde-daemon-5.14.11.1.tar.gz b/dde-daemon-5.14.11.1.tar.gz new file mode 100644 index 0000000..9d6d516 --- /dev/null +++ b/dde-daemon-5.14.11.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b0f722d9b8e7ccb03c8e7352acb6a37509d0278b863822b3853fbc02df32e4ac +size 3368026 diff --git a/deepin-daemon.changes b/deepin-daemon.changes index 7c789b4..a30c884 100644 --- a/deepin-daemon.changes +++ b/deepin-daemon.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Wed Feb 23 07:17:20 UTC 2022 - Hillwood Yang + +- Use last stable version of go to build + +------------------------------------------------------------------- +Fri Feb 18 12:26:55 UTC 2022 - Hillwood Yang + +- Update version to 5.14.11.1 + * Add new features for network, accounts, lastore and bluetooth + * Fix bugs + ------------------------------------------------------------------- Fri Jan 21 06:58:27 UTC 2022 - Hillwood Yang diff --git a/deepin-daemon.spec b/deepin-daemon.spec index 969454a..cf61948 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.97 +Version: 5.14.11.1 Release: 0 Summary: Daemon handling the DDE session settings License: GPL-3.0+ @@ -43,9 +43,6 @@ Patch2: disable-gobuild-in-makefile.patch Patch3: fix-login_defs-path.patch Patch4: harden_deepin-accounts-daemon.service.patch 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 @@ -200,6 +197,7 @@ sed -i 's|/etc/modules-load.d|/usr/lib/modules-load.d|g' Makefile sed -i 's|qdbus|qdbus-qt5|g' network/examples/set_wired_static_ip.sh misc/etc/acpi/powerbtn.sh %build +export GO111MODULE=off %goprep %{import_path} %gobuild ... %make_build @@ -312,6 +310,8 @@ fi %dir %{_sysconfdir}/acpi/events %{_sysconfdir}/acpi/actions/deepin_lid.sh %config %{_sysconfdir}/acpi/events/deepin_lid +%dir %{_sysconfdir}/deepin +%config %{_sysconfdir}/deepin/grub2_edit_auth.conf %{_prefix}/lib/systemd/logind.conf.d/10-%{name}.conf %{_prefix}/lib/udev/rules.d/80-deepin-fprintd.rules %{_datadir}/dbus-1/services/*.service @@ -320,6 +320,11 @@ fi %exclude %{_datadir}/%{_name}/*.tar.gz %{_datadir}/dde/ %{_datadir}/icons/hicolor/*/status/* +%dir %{_datadir}/dsg +%dir %{_datadir}/dsg/apps +%dir %{_datadir}/dsg/apps/dde-session-daemon +%dir %{_datadir}/dsg/apps/dde-session-daemon/configs +%{_datadir}/dsg/apps/dde-session-daemon/configs/gesture.json %{_unitdir}/deepin-accounts-daemon.service %{_sbindir}/rcdeepin-accounts-daemon %{_sbindir}/rchwclock_stop diff --git a/disable-gobuild-in-makefile.patch b/disable-gobuild-in-makefile.patch index dadc581..95671d7 100644 --- a/disable-gobuild-in-makefile.patch +++ b/disable-gobuild-in-makefile.patch @@ -1,8 +1,8 @@ -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) +diff -Nur dde-daemon-5.14.11.1/Makefile dde-daemon-5.14.11.1-new/Makefile +--- dde-daemon-5.14.11.1/Makefile 2022-01-20 09:58:02.000000000 +0800 ++++ dde-daemon-5.14.11.1-new/Makefile 2022-02-17 22:45:53.224122130 +0800 +@@ -5,8 +5,8 @@ + export GO111MODULE=off BINARIES = \ - dde-session-daemon \ @@ -12,7 +12,7 @@ diff -Nur dde-daemon-5.13.49/Makefile dde-daemon-5.13.49-new/Makefile grub2 \ search \ theme-thumb-tool \ -@@ -14,7 +14,7 @@ +@@ -15,7 +15,7 @@ soundeffect \ dde-lockservice \ dde-authority \ @@ -21,16 +21,16 @@ diff -Nur dde-daemon-5.13.49/Makefile dde-daemon-5.13.49-new/Makefile dde-greeter-setter LANGUAGES = $(basename $(notdir $(wildcard misc/po/*.po))) -@@ -29,7 +29,7 @@ - fi +@@ -28,7 +28,7 @@ + @ln -snf ../../../.. ${GOPATH_DIR}/src/${GOPKG_PREFIX}; out/bin/%: prepare -- env GOPATH="${CURDIR}/${GOPATH_DIR}:${GOPATH}" ${GOBUILD} -o $@ ${GOPKG_PREFIX}/bin/${@F} -+# env GOPATH="${CURDIR}/${GOPATH_DIR}:${GOPATH}" ${GOBUILD} -o $@ ${GOPKG_PREFIX}/bin/${@F} +- env GOPATH="${CURDIR}/${GOPATH_DIR}:${GOPATH}" ${GOBUILD} -o $@ ${GOBUILD_OPTIONS} ${GOPKG_PREFIX}/bin/${@F} ++# env GOPATH="${CURDIR}/${GOPATH_DIR}:${GOPATH}" ${GOBUILD} -o $@ ${GOBUILD_OPTIONS} ${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 $@ -@@ -57,7 +57,7 @@ +@@ -56,7 +56,7 @@ 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