From 0846edd03fd6dcc5997fca512df178e6137abbde Mon Sep 17 00:00:00 2001 From: Viktor Ashirov Date: Mon, 30 Oct 2017 19:06:45 +0100 Subject: [PATCH] Issue 49434 - RPM build errors Bug Description: When rpm is built on epel-7 (using mock), build fails because python libraries and tests are installed, but not packaged. Fix Description: Don't install files if we don't plan to package them. https://pagure.io/389-ds-base/issue/49434 Reviewed by: ??? --- rpm/389-ds-base.spec.in | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rpm/389-ds-base.spec.in b/rpm/389-ds-base.spec.in index 52e109504..2fac56032 100644 --- a/rpm/389-ds-base.spec.in +++ b/rpm/389-ds-base.spec.in @@ -282,6 +282,7 @@ autoreconf -fiv $NSSARGS $TCMALLOC_FLAGS $ASAN_FLAGS \ --enable-cmocka +%if 0%{?rhel} >= 8 || 0%{?fedora} make setup.py # lib389 @@ -291,7 +292,7 @@ popd # tests %py3_build - +%endif # Generate symbolic info for debuggers export XCFLAGS=$RPM_OPT_FLAGS @@ -307,6 +308,7 @@ make DESTDIR="$RPM_BUILD_ROOT" install # Copy in our docs from doxygen. cp -r %{_builddir}/%{name}-%{version}%{?prerel}/man/man3 $RPM_BUILD_ROOT/%{_mandir}/man3 +%if 0%{?rhel} >= 8 || 0%{?fedora} # lib389 pushd src/lib389 %py3_install @@ -314,6 +316,7 @@ popd # tests %py3_install +%endif mkdir -p $RPM_BUILD_ROOT/var/log/%{pkgname} mkdir -p $RPM_BUILD_ROOT/var/lib/%{pkgname} -- 2.14.3