[packages/greetd] include explicit target during install on x32

atler atler at pld-linux.org
Tue Jan 4 00:28:19 CET 2022


commit fdd1f34fd3fc3d656d911259d6bf45d156673813
Author: Jan Palus <atler at pld-linux.org>
Date:   Tue Jan 4 00:27:35 2022 +0100

    include explicit target during install on x32

 greetd.spec | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
---
diff --git a/greetd.spec b/greetd.spec
index 50b039e..e214165 100644
--- a/greetd.spec
+++ b/greetd.spec
@@ -29,6 +29,12 @@ 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.
@@ -71,7 +77,7 @@ rm -rf $RPM_BUILD_ROOT
 
 install -d $RPM_BUILD_ROOT{/etc/{greetd,pam.d},%{_bindir},%{systemdunitdir},/var/lib/greetd}
 
-cp -p target/release/{greetd,agreety} $RPM_BUILD_ROOT%{_bindir}
+cp -p %{cargo_outdir}/release/{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
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/greetd.git/commitdiff/fdd1f34fd3fc3d656d911259d6bf45d156673813



More information about the pld-cvs-commit mailing list