diff --git a/startdde-5.8.11.3.tar.xz b/startdde-5.8.11.3.tar.xz deleted file mode 100644 index a1f0eda9a21f0a984da36be588870aa5f46e307e..0000000000000000000000000000000000000000 Binary files a/startdde-5.8.11.3.tar.xz and /dev/null differ diff --git a/startdde-5.9.32.tar.gz b/startdde-5.9.32.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..dfeec7aeaacf1b8cefebc85899fac7272fcb7848 Binary files /dev/null and b/startdde-5.9.32.tar.gz differ diff --git a/startdde.spec b/startdde.spec index 83285776130c0d90f745ba48d53857e588cc31ba..073d9f297c846db58c67dcf6e3bc17f1c6d93869 100644 --- a/startdde.spec +++ b/startdde.spec @@ -1,19 +1,25 @@ +## START: Set by rpmautospec +## (rpmautospec version 0.2.6) +%define autorelease(e:s:pb:) %{?-p:0.}%{lua: + release_number = 1; + base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}")); + print(release_number + base_release_number - 1); +}%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{?dist} +## END: Set by rpmautospec + %global _missing_build_ids_terminate_build 0 %global debug_package %{nil} +%global dde_prefix dde +%global dde_prefix deepin -%define specrelease 1%{?dist} -%if 0%{?openeuler} -%define specrelease 1 -%endif Name: startdde -Version: 5.8.11.3 -Release: %{specrelease} +Version: 5.9.32 +Release: 1 Summary: Starter of deepin desktop environment License: GPLv3 URL: https://github.com/linuxdeepin/startdde -Source0: %{name}-%{version}.tar.xz -Source1: vendor.tar.gz +Source0: %{name}-%{version}.tar.gz BuildRequires: golang BuildRequires: jq @@ -26,40 +32,41 @@ BuildRequires: pulseaudio-libs-devel BuildRequires: libgnome-keyring-devel BuildRequires: alsa-lib-devel BuildRequires: pkgconfig(gudev-1.0) -BuildRequires: dde-api-devel BuildRequires: libsecret-devel Provides: x-session-manager -Requires: dde-daemon +Requires: %{dde_prefix}-daemon Requires: procps Requires: deepin-desktop-schemas -Requires: dde-kwin -Requires: libXfixes -Requires: libXcursor -Requires: libsecret -Recommends: dde-qt5integration +Requires: %{dde_prefix}-kwin +Recommends: %{dde_prefix}-qt5integration %description %{summary}. %prep -%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 - -patch Makefile < rpm/Makefile.patch -patch main.go < rpm/main.go.patch -tar -xf %{SOURCE1} - -%build -export GOPATH=%{_builddir}/%{name}-%{version}/vendor:$GOPATH +%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 -%make_build GO_BUILD_FLAGS=-trimpath +%build +make prepare +touch prepare +export GOPATH="$PWD/gopath:%{gopath}" +%gobuild -o startdde +# rebuild other executables with different build-ids +for cmd in fix-xauthority-perm greeter-display-daemon; do + %gobuild -o $cmd github.com/linuxdeepin/startdde/cmd/$cmd +done +%make_build %install %make_install +%find_lang %{name} %post xsOptsFile=/etc/X11/Xsession.options @@ -72,25 +79,25 @@ if [ -f $xsOptsFile ];then fi fi -%files +%files -f %{name}.lang %doc README.md %license LICENSE %{_sysconfdir}/X11/xinit/xinitrc.d/00deepin-dde-env %{_sysconfdir}/X11/xinit/xinitrc.d/01deepin-profile +%{_sysconfdir}/X11/xinit/xinitrc.d/94qt_env %{_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}/%{name}/app_startup.conf -%{_datadir}/%{name}/filter.conf -%{_datadir}/glib-2.0/schemas/com.deepin.dde.display.gschema.xml -%{_datadir}/glib-2.0/schemas/com.deepin.dde.startdde.gschema.xml -/usr/lib/deepin-daemon/greeter-display-daemon +%{_datadir}/%{name}/ +%{_libexecdir}/deepin-daemon/greeter-display-daemon +%{_datadir}/glib-2.0/schemas/* %changelog +* Tue Nov 8 2022 hkgy - 5.9.32-1 +- Upgrade to v5.9.32 + * Tue Jul 19 2022 konglidong - 5.8.11.3-1 - update to 5.8.11.3 diff --git a/vendor.tar.gz b/vendor.tar.gz deleted file mode 100644 index a8ffb6247ce1b28f70c3c8289a010ea99a356d9b..0000000000000000000000000000000000000000 Binary files a/vendor.tar.gz and /dev/null differ