From 831aa28f9aba57c6e696ac4e835f9cd52e07e86a Mon Sep 17 00:00:00 2001 From: Jan Palus Date: Wed, 5 Jan 2022 13:37:33 +0100 Subject: [PATCH] use %cargo_objdir --- greetd.spec | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/greetd.spec b/greetd.spec index e214165..c24f09b 100644 --- a/greetd.spec +++ b/greetd.spec @@ -16,7 +16,7 @@ URL: https://git.sr.ht/~kennylevinsen/greetd BuildRequires: cargo BuildRequires: pam-devel BuildRequires: pkgconfig -BuildRequires: rpmbuild(macros) >= 2.004 +BuildRequires: rpmbuild(macros) >= 2.011 BuildRequires: rust BuildRequires: scdoc BuildRequires: tar >= 1:1.22 @@ -29,12 +29,6 @@ Requires: greetd(greeter) Provides: user(greetd-greeter) BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%ifarch x32 -%define cargo_outdir target/x86_64-unknown-linux-gnux32 -%else -%define cargo_outdir target -%endif - %description greetd is a minimal and flexible login manager daemon that makes no assumptions about what you want to launch. @@ -77,7 +71,7 @@ rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT{/etc/{greetd,pam.d},%{_bindir},%{systemdunitdir},/var/lib/greetd} -cp -p %{cargo_outdir}/release/{greetd,agreety} $RPM_BUILD_ROOT%{_bindir} +cp -p %{cargo_objdir}/{greetd,agreety} $RPM_BUILD_ROOT%{_bindir} sed -e 's/^\([#[:space:]]*\)\?user[[:space:]]*=.*/user = greetd-greeter/' config.toml > $RPM_BUILD_ROOT/etc/greetd/config.toml cp -p greetd.service $RPM_BUILD_ROOT%{systemdunitdir} cp -p %{SOURCE2} $RPM_BUILD_ROOT/etc/pam.d/greetd -- 2.44.0