[packages/python3-adblock] explicit target for all archs

[atler]

commit d54984e9712980475d93cc07d9ac21e049444ffc
Author: Jan Palus <atler at pld-linux.org>
Date:   Tue Mar 1 17:46:21 2022 +0100

    explicit target for all archs

 python3-adblock.spec | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)
---
diff --git a/python3-adblock.spec b/python3-adblock.spec
index 75505b5..85d92a8 100644
--- a/python3-adblock.spec
+++ b/python3-adblock.spec
@@ -17,19 +17,13 @@ BuildRequires:	cargo
 BuildRequires:	maturin >= 0.10
 BuildRequires:	python3-devel >= 1:3.6
 BuildRequires:	rpm-pythonprov
-BuildRequires:	rpmbuild(macros) >= 2.004
+BuildRequires:	rpmbuild(macros) >= 2.012
 BuildRequires:	rust >= 1.45
 BuildRequires:	tar >= 1:1.22
 BuildRequires:	xz
 ExclusiveArch:	%{rust_arches}
 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
 Python wrapper for Brave's adblocking library, which is written in
 Rust.
@@ -63,15 +57,13 @@ export RUSTFLAGS="%{rpmrustflags}"
 export RUSTFLAGS="$RUSTFLAGS -C opt-level=1"
 %endif
 /usr/bin/maturin build --release --no-sdist \
-%ifarch x32
-	--target x86_64-unknown-linux-gnux32
-%endif
+	--target %{rust_target}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 install -d $RPM_BUILD_ROOT%{py3_sitedir}
-cp -p %{cargo_outdir}/release/libadblock.so $RPM_BUILD_ROOT%{py3_sitedir}/%{module}.so
+cp -p %{cargo_objdir}/libadblock.so $RPM_BUILD_ROOT%{py3_sitedir}/%{module}.so
 
 %clean
 rm -rf $RPM_BUILD_ROOT
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/python3-adblock.git/commitdiff/d54984e9712980475d93cc07d9ac21e049444ffc