From cd49e2407c83f7fcdf30566af5f7ab470d801e19 Mon Sep 17 00:00:00 2001 From: Martin Sehnoutka Date: Thu, 3 Oct 2019 13:49:56 +0200 Subject: [PATCH] replace _libdir with _prefix/lib _libdir is platform dependant, but that is not what we want because we would need additional runtime logic to handle platforms. this patch overrides the defautl location --- osbuild.spec | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/osbuild.spec b/osbuild.spec index 5665b6e9..3c4c1d97 100644 --- a/osbuild.spec +++ b/osbuild.spec @@ -1,4 +1,5 @@ %global pypi_name osbuild +%global pkgdir %{_prefix}/lib/%{pypi_name} Name: %{pypi_name} Version: 2 @@ -47,13 +48,13 @@ A build system for OS images %install %py3_install -mkdir -p %{buildroot}%{_libdir}/%{pypi_name}/stages -install -p -m 0755 $(find stages -type f) %{buildroot}%{_libdir}/%{pypi_name}/stages/ +mkdir -p %{buildroot}%{pkgdir}/stages +install -p -m 0755 $(find stages -type f) %{buildroot}%{pkgdir}/stages/ -mkdir -p %{buildroot}%{_libdir}/%{pypi_name}/assemblers -install -p -m 0755 $(find assemblers -type f) %{buildroot}%{_libdir}/%{pypi_name}/assemblers/ +mkdir -p %{buildroot}%{pkgdir}/assemblers +install -p -m 0755 $(find assemblers -type f) %{buildroot}%{pkgdir}/assemblers/ -install -p -m 0755 osbuild-run %{buildroot}%{_libdir}/%{pypi_name}/ +install -p -m 0755 osbuild-run %{buildroot}%{pkgdir}/ %check exit 0 @@ -63,7 +64,7 @@ exit 0 %files %license LICENSE %{_bindir}/osbuild -%{_libdir}/%{pypi_name} +%{pkgdir} %files -n python3-%{pypi_name} %license LICENSE