!42 升级到5.8.34.3

From: @lvgenggeng 
Reviewed-by: @HelloWorld_lvcongqing 
Signed-off-by: @HelloWorld_lvcongqing

startdde.spec

@@ -1,77 +1,98 @@
-%global with_debug 1
+%global _missing_build_ids_terminate_build 0
-%global _unpackaged_files_terminate_build 0
-%if 0%{?with_debug}
 %global debug_package   %{nil}
-%endif
+
 
 Name:           startdde
-Version:        5.4.0.1
+Version:        5.8.34.3
-Release:        5
+Release:        1
 Summary:        Starter of deepin desktop environment
 License:        GPLv3
-URL:            https://shuttle.deepin.com/cache/repos/eagle/release-candidate/RERFNS4wLjAuMzUyOA/pool/main/s/startdde/
+URL:            https://github.com/linuxdeepin/startdde
-Source0:        https://shuttle.deepin.com/cache/repos/eagle/release-candidate/RERFNS4wLjAuMzUyOA/pool/main/s/${name}/%{name}_%{version}.orig.tar.xz
+Source0:        %{name}-%{version}.orig.tar.xz
 
-BuildRequires:  golang jq
+BuildRequires:  golang
-BuildRequires:  dde-api
+BuildRequires:  jq
+BuildRequires:  gocode
 BuildRequires:  glib2-devel
-BuildRequires:  libX11
+BuildRequires:  pkgconfig(x11)
-BuildRequires:  libX11-devel
 BuildRequires:  libXcursor-devel
-BuildRequires:  libXcursor
 BuildRequires:  libXfixes-devel
-BuildRequires:  libXfixes
 BuildRequires:  gtk3-devel
 BuildRequires:  pulseaudio-libs-devel
 BuildRequires:  libgnome-keyring-devel
 BuildRequires:  alsa-lib-devel
-BuildRequires:  alsa-lib
+BuildRequires:  pkgconfig(gudev-1.0)
+BuildRequires:  pkgconfig(libsecret-unstable)
+BuildRequires:  golang-github-linuxdeepin-go-x11-client-devel
+BuildRequires:  golang-github-linuxdeepin-go-dbus-factory-devel
+BuildRequires:  go-lib-devel
+BuildRequires:  go-gir-generator
+BuildRequires:  dde-api-devel
 
-%{?systemd_requires}
+
+Provides:       x-session-manager
 Requires:       dde-daemon
-Requires:       libcgroup-tools
+Requires:       procps
+Requires:       deepin-desktop-schemas
+Requires:       dde-kwin
+Requires:       libXfixes
+Requires:       libXcursor
+Recommends:     dde-qt5integration
+Requires:       deepin-proxy
 
 %description
-Startdde is used for launching DDE components and invoking user's
+%{summary}.
-custom applications which compliant with xdg autostart specification.
 
 %prep
-%setup -q
+%autosetup -n %{name}-%{version}
+sed -i 's|/usr/lib/deepin-daemon|/usr/libexec/deepin-daemon|g' \
+misc/auto_launch/chinese.json misc/auto_launch/default.json
 
-sed -i '/polkit/s|lib|libexec|' watchdog/dde_polkit_agent.go
+patch Makefile < rpm/Makefile.patch
-sed -i '/deepin-daemon/s|lib|libexec|' utils.go session.go misc/auto_launch/*.json
+patch main.go < rpm/main.go.patch
 
 %build
-export GOPATH=%{_builddir}/%{name}-%{version}/vendor
+export GOPATH=/usr/share/gocode
-BUILD_ID="0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \n')"
+
-%make_build GOBUILD="go build -mod=vendor -compiler gc -ldflags \"${LDFLAGS} -B $BUILD_ID\" -a -v -x"
+## Scripts in /etc/X11/Xsession.d are not executed after xorg start
+sed -i 's|X11/Xsession.d|X11/xinit/xinitrc.d|g' Makefile
+
+%make_build GO_BUILD_FLAGS=-trimpath
 
 %install
 %make_install
 
-#%post
+%post
-#%systemd_post dde-readahead.service
+xsOptsFile=/etc/X11/Xsession.options
-
+update-alternatives --install /usr/bin/x-session-manager x-session-manager \
-#%preun
+    /usr/bin/startdde 90 || true
-#%systemd_preun dde-readahead.service
+if [ -f $xsOptsFile ];then
-
+	sed -i '/^use-ssh-agent/d' $xsOptsFile
-#%postun
+	if ! grep '^no-use-ssh-agent' $xsOptsFile >/dev/null; then
-#%systemd_postun_with_restart dde-readahead.service
+		echo no-use-ssh-agent >> $xsOptsFile
+	fi
+fi
 
 %files
 %doc README.md
 %license LICENSE
-%{_sysconfdir}/X11/Xsession.d/00deepin-dde-env
+%{_sysconfdir}/X11/xinit/xinitrc.d/00deepin-dde-env
-%{_sysconfdir}/X11/Xsession.d/01deepin-profile
+%{_sysconfdir}/X11/xinit/xinitrc.d/01deepin-profile
+%{_sysconfdir}/profile.d/deepin-xdg-dir.sh
 %{_bindir}/%{name}
 %{_sbindir}/deepin-fix-xauthority-perm
 %{_datadir}/xsessions/deepin.desktop
 %{_datadir}/lightdm/lightdm.conf.d/60-deepin.conf
 %{_datadir}/%{name}/auto_launch.json
 %{_datadir}/%{name}/memchecker.json
+%{_datadir}/glib-2.0/schemas/*
+%{_datadir}/startdde/*
 /usr/lib/deepin-daemon/greeter-display-daemon
 
 %changelog
+* Fri Dec 01 2023 lvgenggeng <lvgenggeng@uniontech.com> - 5.8.34.3-1
+- bump to 5.8.34.3
+
 * Thu Jul 28 2022 liweiganga <liweiganga@uniontech.com> - 5.4.0.1-5
 - fix: delete dde-readahead.service