diff --git a/.gitignore b/.gitignore index 2de38e8..027f66f 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /startdde-3.11.0.tar.gz /startdde-3.12.1.tar.gz /startdde-5.0.1.tar.gz +/startdde-5.6.0.10.tar.gz diff --git a/.packit.yaml b/.packit.yaml new file mode 100644 index 0000000..d39b576 --- /dev/null +++ b/.packit.yaml @@ -0,0 +1,17 @@ +# See the documentation for more information: +# https://packit.dev/docs/configuration/ + +specfile_path: rpm/startdde.spec + +# add or remove files that should be synced +synced_files: + - rpm/startdde.spec + - .packit.yaml + +upstream_package_name: startdde +# downstream (Fedora) RPM package name +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" diff --git a/README.packit b/README.packit new file mode 100644 index 0000000..73ac72c --- /dev/null +++ b/README.packit @@ -0,0 +1,3 @@ +This repository is maintained by packit. +https://packit.dev/ +The file was generated using packit 0.16.1.dev31+g5d22fb7. diff --git a/sources b/sources index ce61f7a..8bbe3ec 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (startdde-5.0.1.tar.gz) = accd1ba00136e2527303c3d093a5e63b57ed2bc22df19b4a4aa3d795279f50161abc1c05cf7cbb621cb06ec95ae0468b903ebcf4c6626f50bc0265f1aa2f2942 +SHA512 (startdde-5.6.0.10.tar.gz) = fdce5d97b2be9e307d1d46edb87aa0027af803e86a2f19ba4fdab90444d91f54531f078f74f26c0ab6dc256d7a374fa563fa28c28db7e91ce99ad78b9804cf72 diff --git a/startdde.spec b/startdde.spec index 3e89a9a..10eef89 100644 --- a/startdde.spec +++ b/startdde.spec @@ -1,53 +1,74 @@ +%if 0%{?fedora} == 0 +%global without_debug 1 +%endif +%if 0%{?without_debug} +%global debug_package %{nil} +%endif + Name: startdde -Version: 5.0.1 -Release: 4%{?dist} +Version: 5.6.0.10 +Release: 1%{?dist} Summary: Starter of deepin desktop environment License: GPLv3 URL: https://github.com/linuxdeepin/startdde +%if 0%{?fedora} 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: golang jq -BuildRequires: deepin-gir-generator -BuildRequires: golang(pkg.deepin.io/dde/api/dxinput) >= 3.1.26 -BuildRequires: golang(pkg.deepin.io/lib) >= 1.2.11 -BuildRequires: golang(github.com/linuxdeepin/go-dbus-factory/org.bluez) +%if 0%{?fedora} +BuildRequires: golang(pkg.deepin.io/dde/api/dxinput) +BuildRequires: golang(pkg.deepin.io/lib) +BuildRequires: golang(github.com/godbus/dbus) BuildRequires: golang(github.com/linuxdeepin/go-x11-client) -BuildRequires: golang(github.com/cryptix/wav) -BuildRequires: golang(github.com/BurntSushi/xgb) -BuildRequires: golang(github.com/BurntSushi/xgbutil) -BuildRequires: pkgconfig(alsa) -BuildRequires: pkgconfig(libcanberra) -BuildRequires: pkgconfig(libpulse) -BuildRequires: pkgconfig(gobject-2.0) -BuildRequires: pkgconfig(glib-2.0) -BuildRequires: pkgconfig(gdk-3.0) -BuildRequires: pkgconfig(gdk-pixbuf-xlib-2.0) -BuildRequires: pkgconfig(gnome-keyring-1) -BuildRequires: pkgconfig(x11) -BuildRequires: pkgconfig(xi) -BuildRequires: pkgconfig(systemd) -%{?systemd_requires} +BuildRequires: golang(github.com/davecgh/go-spew/spew) +BuildRequires: golang(golang.org/x/xerrors) +BuildRequires: systemd-rpm-macros Requires: deepin-daemon -Requires: deepin-kwin -Requires: libcgroup-tools +%else +BuildRequires: golang-github-davecgh-go-spew-devel +BuildRequires: gocode >= 0.0.0.1 +BuildRequires: golang-golang-x-xerrors-devel +%endif +BuildRequires: golang-github-cryptix-wav-devel +BuildRequires: glib2-devel +BuildRequires: pkgconfig(x11) +BuildRequires: libXcursor-devel +BuildRequires: libXfixes-devel +BuildRequires: gtk3-devel +BuildRequires: pulseaudio-libs-devel +BuildRequires: libgnome-keyring-devel +BuildRequires: alsa-lib-devel +BuildRequires: pkgconfig(gudev-1.0) %description Startdde is used for launching DDE components and invoking user's custom applications which compliant with xdg autostart specification. %prep -%setup -q - +%autosetup +patch Makefile < rpm/Makefile.patch +# 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 '/deepin-daemon/s|lib|libexec|' utils.go session.go misc/auto_launch/*.json -# Fix fallback session script path (RHBZ#1706281) -sed -i 's|/usr/sbin/lightdm-session|%{_sysconfdir}/X11/xinit/Xsession|' misc/deepin-session %build 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 -v -x" +%make_build GOBUILD="go build -compiler gc -ldflags \"${LDFLAGS} -B $BUILD_ID\" -a $GO_BUILD_FLAGS -v -x" +# 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" +done %install %make_install @@ -64,16 +85,20 @@ BUILD_ID="0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \n')" %files %doc README.md %license LICENSE -%{_sysconfdir}/X11/Xsession.d/00deepin-dde-env +%{_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-session %{_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}/%{name}/ +%{_libexecdir}/deepin-daemon/greeter-display-daemon %changelog +* Wed Sep 30 2020 Robin Lee - 5.6.0.10-1 +- new upstream release: 5.6.0.10 + * Sat Aug 01 2020 Fedora Release Engineering - 5.0.1-4 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild