diff --git a/.gitignore b/.gitignore index e4c6ecb..3016889 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /startdde-5.6.0.35.1.tar.gz /startdde-5.8.29.tar.gz /startdde-5.9.32.tar.gz +/startdde-5.10.1.tar.gz diff --git a/0001-Run-lspci-with-full-path-on-Fedora.patch b/0001-Run-lspci-with-full-path-on-Fedora.patch new file mode 100644 index 0000000..fa283fd --- /dev/null +++ b/0001-Run-lspci-with-full-path-on-Fedora.patch @@ -0,0 +1,25 @@ +From e1cb1e40097e893547f25f11d7524ecbe845feb8 Mon Sep 17 00:00:00 2001 +From: Robin Lee +Date: Wed, 5 Oct 2022 15:59:06 +0800 +Subject: [PATCH] Run lspci with full path on Fedora + +--- + display/manager.go | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/display/manager.go b/display/manager.go +index 68d916d..6be3c77 100644 +--- a/display/manager.go ++++ b/display/manager.go +@@ -2845,7 +2845,7 @@ func (m *Manager) updateScreenSize() { + + func getLspci(args []string) (string, error) { + ctx, cancel := context.WithTimeout(context.Background(), time.Second*5) +- cmd := exec.CommandContext(ctx, "lspci", args...) ++ cmd := exec.CommandContext(ctx, "/usr/sbin/lspci", args...) + cmd.Env = []string{ + "LC_ALL=C", + } +-- +2.37.2 + diff --git a/sources b/sources index f9ae3f1..35e0027 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (startdde-5.9.32.tar.gz) = f1fb5b61d5aabebf2bbb7023d6556d4788012cb9c5cb95b1843c7121d2342360f200493dfcbe15cbdf9ac409e2af9ccbe7b57ceb21e721ac8a641c44d6bab8fa +SHA512 (startdde-5.10.1.tar.gz) = eaf3c3fbeeac44ac63b761ec55f8a2eec70c80f883eea5207d35e542ff9e86b5d7da944b5b76ff0c6c3fcb25f780af7c097d98493e04e9740c63e2579443d999 diff --git a/startdde.spec b/startdde.spec index 5c65613..f7fc2bc 100644 --- a/startdde.spec +++ b/startdde.spec @@ -7,20 +7,14 @@ %endif Name: startdde -Version: 5.9.32 +Version: 5.10.1 Release: %autorelease Summary: Starter of deepin desktop environment -License: GPLv3 +# migrated to SPDX +License: GPL-3.0-or-later URL: https://github.com/linuxdeepin/startdde -%if 0%{?openeuler} -Source0: %{name}_%{version}.orig.tar.xz - -BuildRequires: gocode -Requires: gocode -Requires: libXfixes -Requires: libXcursor -%else Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz +Patch0: 0001-Run-lspci-with-full-path-on-Fedora.patch ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} BuildRequires: compiler(go-compiler) @@ -32,8 +26,6 @@ BuildRequires: golang(github.com/davecgh/go-spew/spew) BuildRequires: golang(golang.org/x/xerrors) BuildRequires: systemd-rpm-macros BuildRequires: make -%endif - BuildRequires: golang BuildRequires: jq BuildRequires: glib2-devel @@ -52,6 +44,8 @@ Requires: %{dde_prefix}-daemon Requires: procps Requires: deepin-desktop-schemas Requires: %{dde_prefix}-kwin +# for lspci command +Requires: pciutils Recommends: %{dde_prefix}-qt5integration %description @@ -61,10 +55,8 @@ Recommends: %{dde_prefix}-qt5integration %autosetup -p1 -n %{name}-%{version} ## Scripts in /etc/X11/Xsession.d are not executed after xorg start sed -i 's|X11/Xsession.d|X11/xinit/xinitrc.d|g' Makefile -# fix deepin-daemon executables path -find * -type f -not -path "rpm/*" -print0 | xargs -0 sed -i 's:/lib/deepin-daemon/:/libexec/deepin-daemon/:' -# fix dde-polkit-agent path -sed -i '/polkit/s|lib|libexec|' watchdog/dde_polkit_agent.go + +sed -i 's|/etc/os-version|/etc/uos-version|' vm.go utils.go misc/Xsession.d/00deepin-dde-env %build make prepare @@ -104,8 +96,9 @@ fi %{_datadir}/xsessions/deepin.desktop %{_datadir}/lightdm/lightdm.conf.d/60-deepin.conf %{_datadir}/%{name}/ -%{_libexecdir}/deepin-daemon/greeter-display-daemon +%{_prefix}/lib/deepin-daemon/greeter-display-daemon %{_datadir}/glib-2.0/schemas/* +%{_datadir}/dsg/ %changelog %autochangelog