From 98e034a51f7c792302cc128e47d452df2ba8ce71 Mon Sep 17 00:00:00 2001 From: Robin Lee Date: Mar 11 2021 07:52:55 +0000 Subject: [packit] 5.6.0.35.1 upstream release Upstream tag: 5.6.0.35.1 Upstream commit: ef75657f Signed-off-by: Robin Lee --- diff --git a/.gitignore b/.gitignore index 027f66f..3253789 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /startdde-3.12.1.tar.gz /startdde-5.0.1.tar.gz /startdde-5.6.0.10.tar.gz +/startdde-5.6.0.35.1.tar.gz diff --git a/.packit.yaml b/.packit.yaml index d39b576..6067380 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -14,4 +14,4 @@ downstream_package_name: startdde actions: fix-spec-file: | - bash -c "sed -i -r \"s/Version:(\s*)\S*/Version:\1${PACKIT_PROJECT_VERSION}/\" rpm/startdde.spec" + bash -c "sed -i -r \"0,/Version:/ s/Version:(\s*)\S*/Version:\1${PACKIT_PROJECT_VERSION}/\" rpm/startdde.spec" diff --git a/README.packit b/README.packit index 73ac72c..332e553 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.16.1.dev31+g5d22fb7. +The file was generated using packit 0.26.0. diff --git a/sources b/sources index 8bbe3ec..64b44fe 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (startdde-5.6.0.10.tar.gz) = fdce5d97b2be9e307d1d46edb87aa0027af803e86a2f19ba4fdab90444d91f54531f078f74f26c0ab6dc256d7a374fa563fa28c28db7e91ce99ad78b9804cf72 +SHA512 (startdde-5.6.0.35.1.tar.gz) = 48bc2d9117ca3eaaeec58e323674a01abbabf0f9faa966c312b1efae639553510d67d5f5c905dac44dafd80325d5c211d953aaa7015009cbcbe2e64521290d84 diff --git a/startdde.spec b/startdde.spec index 46e07e1..6c7d819 100644 --- a/startdde.spec +++ b/startdde.spec @@ -1,26 +1,31 @@ -%if 0%{?fedora} == 0 -%global without_debug 1 -%endif -%if 0%{?without_debug} +%define specrelease 1%{?dist} +%if 0%{?openeuler} +%define specrelease 1 +%global _missing_build_ids_terminate_build 0 %global debug_package %{nil} +%global dde_prefix dde +%else +%global dde_prefix deepin %endif Name: startdde -Version: 5.6.0.10 -Release: 2%{?dist} +Version: 5.6.0.35.1 +Release: %{specrelease} Summary: Starter of deepin desktop environment License: GPLv3 URL: https://github.com/linuxdeepin/startdde -%if 0%{?fedora} +%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 ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} -%else -Source0: %{name}_%{version}.orig.tar.xz -%endif -BuildRequires: make -BuildRequires: golang jq -%if 0%{?fedora} +BuildRequires: compiler(go-compiler) BuildRequires: golang(pkg.deepin.io/dde/api/dxinput) BuildRequires: golang(pkg.deepin.io/lib) BuildRequires: golang(github.com/godbus/dbus) @@ -28,13 +33,11 @@ BuildRequires: golang(github.com/linuxdeepin/go-x11-client) BuildRequires: golang(github.com/davecgh/go-spew/spew) BuildRequires: golang(golang.org/x/xerrors) BuildRequires: systemd-rpm-macros -Requires: deepin-daemon -%else -BuildRequires: golang-github-davecgh-go-spew-devel -BuildRequires: gocode >= 0.0.0.1 -BuildRequires: golang-golang-x-xerrors-devel +BuildRequires: make %endif -BuildRequires: golang-github-cryptix-wav-devel + +BuildRequires: golang +BuildRequires: jq BuildRequires: glib2-devel BuildRequires: pkgconfig(x11) BuildRequires: libXcursor-devel @@ -45,43 +48,52 @@ BuildRequires: libgnome-keyring-devel BuildRequires: alsa-lib-devel BuildRequires: pkgconfig(gudev-1.0) +Provides: x-session-manager +Requires: %{dde_prefix}-daemon +Requires: procps +Requires: deepin-desktop-schemas +Requires: %{dde_prefix}-kwin +Recommends: %{dde_prefix}-qt5integration + %description -Startdde is used for launching DDE components and invoking user's -custom applications which compliant with xdg autostart specification. +%{summary}. %prep -%autosetup -patch Makefile < rpm/Makefile.patch +%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 %build +%if 0%{?openeuler} +export GOPATH=/usr/share/gocode +%make_build GO_BUILD_FLAGS=-trimpath +%else export GOPATH="%{gopath}" -%if 0%{?without_debug} -GO_BUILD_FLAGS="-trimpath" -%endif -BUILD_ID="0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \n')" -%make_build GOBUILD="go build -compiler gc -ldflags \"${LDFLAGS} -B $BUILD_ID\" -a $GO_BUILD_FLAGS -v -x" +%make_build GO_BUILD_FLAGS="%{gobuildflags}" # rebuild other executables with different build-ids for cmd in fix-xauthority-perm greeter-display-daemon; do rm $cmd - BUILD_ID="0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \n')" - %make_build $cmd GOBUILD="go build -compiler gc -ldflags \"${LDFLAGS} -B $BUILD_ID\" -a $GO_BUILD_FLAGS -v -x" + %make_build $cmd GO_BUILD_FLAGS="%{gobuildflags}" done +%endif %install %make_install %post -%systemd_post dde-readahead.service - -%preun -%systemd_preun dde-readahead.service - -%postun -%systemd_postun_with_restart dde-readahead.service +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 @@ -97,6 +109,9 @@ done %{_libexecdir}/deepin-daemon/greeter-display-daemon %changelog +* Thu Mar 11 2021 Robin Lee - 5.6.0.35.1-1 +- fix(session): 社区版不收集应用打开关闭和电脑开关机信息 (chenyunxiong) + * Wed Jan 27 2021 Fedora Release Engineering - 5.6.0.10-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild