diff --git a/startdde-5.8.34.3.orig.tar.xz b/startdde-5.8.34.3.orig.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..0cb0a0654cfcf43c03853f485574f8d264e513fe Binary files /dev/null and b/startdde-5.8.34.3.orig.tar.xz differ diff --git a/startdde.spec b/startdde.spec index 368c8dbeafd2105ed2740b24764ae925f1865a94..6e423871c13bf613d50fe68871134ded7a6e5bd3 100644 --- a/startdde.spec +++ b/startdde.spec @@ -1,88 +1,125 @@ -%global with_debug 1 -%global _unpackaged_files_terminate_build 0 -%if 0%{?with_debug} +%global _missing_build_ids_terminate_build 0 %global debug_package %{nil} -%endif + Name: startdde -Version: 5.4.0.1 -Release: 5 +Version: 5.8.34.3 +Release: 2%{?dist}.03 Summary: Starter of deepin desktop environment License: GPLv3 -URL: https://shuttle.deepin.com/cache/repos/eagle/release-candidate/RERFNS4wLjAuMzUyOA/pool/main/s/startdde/ -Source0: https://shuttle.deepin.com/cache/repos/eagle/release-candidate/RERFNS4wLjAuMzUyOA/pool/main/s/${name}/%{name}_%{version}.orig.tar.xz - -BuildRequires: golang jq -BuildRequires: dde-api +URL: https://github.com/linuxdeepin/startdde +Source0: %{name}-%{version}.orig.tar.xz + +BuildRequires: golang +BuildRequires: jq +%if 0%{?openeuler} +BuildRequires: gocode +%else +BuildRequires: golang-github-davecgh-go-spew-devel +BuildRequires: golang-x-xerrors-devel +BuildRequires: golang-github-fsnotify-fsnotify-devel +BuildRequires: golang-dbus +BuildRequires: golang-github-rickb777-date-devel +BuildRequires: golang-github-mattn-go-sqlite3-devel +BuildRequires: golang-gopkg-alecthomas-kingpin-devel +BuildRequires: golang-github-disintegration-imaging-devel +BuildRequires: golang-github-fogleman-gg-devel +BuildRequires: golang-github-gosexy-gettext-devel +BuildRequires: golang-github-axgle-mahonia-devel +BuildRequires: golang-github-cryptix-wav-devel +BuildRequires: golang-github-kelvins-sunrisesunset-devel +BuildRequires: golang-github-lofanmi-pinyin +BuildRequires: golang-github-nfnt-resize-devel +BuildRequires: golang-x-image-devel +BuildRequires: golang-x-text-devel +BuildRequires: golang-github-mozillazg-pinyin +BuildRequires: golang-github-msteinert-pam-devel +BuildRequires: golang-github-stretchr-testify-devel +%endif BuildRequires: glib2-devel -BuildRequires: libX11 -BuildRequires: libX11-devel +BuildRequires: pkgconfig(x11) 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 -custom applications which compliant with xdg autostart specification. +%{summary}. %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 -sed -i '/deepin-daemon/s|lib|libexec|' utils.go session.go misc/auto_launch/*.json +patch Makefile < rpm/Makefile.patch +patch main.go < rpm/main.go.patch %build -export GOPATH=%{_builddir}/%{name}-%{version}/vendor -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" +%ifarch loongarch64 +export GOOS="linux" +export CGO_ENABLED=1 +%endif -%install -%make_install +export GOPATH=/usr/share/gocode + +## Scripts in /etc/X11/Xsession.d are not executed after xorg start +sed -i 's|X11/Xsession.d|X11/xinit/xinitrc.d|g' Makefile -#%post -#%systemd_post dde-readahead.service +%make_build GO_BUILD_FLAGS=-trimpath -#%preun -#%systemd_preun dde-readahead.service +%install +%make_install -#%postun -#%systemd_postun_with_restart dde-readahead.service +%post +xsOptsFile=/etc/X11/Xsession.options +update-alternatives --install /usr/bin/x-session-manager x-session-manager \ + /usr/bin/startdde 90 || true +if [ -f $xsOptsFile ];then + sed -i '/^use-ssh-agent/d' $xsOptsFile + if ! grep '^no-use-ssh-agent' $xsOptsFile >/dev/null; then + echo no-use-ssh-agent >> $xsOptsFile + fi +fi %files %doc README.md %license LICENSE -%{_sysconfdir}/X11/Xsession.d/00deepin-dde-env -%{_sysconfdir}/X11/Xsession.d/01deepin-profile +%{_sysconfdir}/X11/xinit/xinitrc.d/00deepin-dde-env +%{_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 -* Thu Jul 28 2022 liweiganga - 5.4.0.1-5 -- fix: delete dde-readahead.service - -* Thu Sep 3 2020 weidong - 5.4.0.1-4 -- fix source url in spec - -* Wed Sep 2 2020 chenbo pan - 5.4.0.1-3 -- fix requires golang devel - -* Tue Aug 18 2020 chenbo pan - 5.4.0.1-2 -- remove golang devel +* Tue Jun 28 2022 liweiganga - 5.8.34.3-2.03 +- fix: add requires deepin-proxy -* Thu Jul 30 2020 openEuler Buildteam - 5.4.0.1-1 -- Package init +* Fri Jun 10 2022 uoser - 5.8.34.3-2.02 +- update to 5.8.34.3-2.02 diff --git a/startdde_5.4.0.1.orig.tar.xz b/startdde_5.4.0.1.orig.tar.xz deleted file mode 100755 index 66c0efc35678c59311b39afb8fffb022eae85db7..0000000000000000000000000000000000000000 Binary files a/startdde_5.4.0.1.orig.tar.xz and /dev/null differ