Update BuildRequires for eln

jsoncpp and rhash are going to be removed from eln.
This commit is contained in:
Tom Stellard 2020-11-09 22:08:07 +00:00
parent 5db8037248
commit 61280587ec

View File

@ -39,6 +39,14 @@
%bcond_without sphinx %bcond_without sphinx
%endif %endif
%if !0%{?rhel}
%bcond_with bundled_jsoncpp
%bcond_with bundled_rhash
%else
%bcond_without bundled_jsoncpp
%bcond_without bundled_rhash
%endif
# Run tests # Run tests
%bcond_without test %bcond_without test
@ -62,7 +70,7 @@
%{?rcsuf:%global versuf -%{rcsuf}} %{?rcsuf:%global versuf -%{rcsuf}}
# For handling bump release by rpmdev-bumpspec and mass rebuild # For handling bump release by rpmdev-bumpspec and mass rebuild
%global baserelease 3 %global baserelease 4
# Uncomment if building for EPEL # Uncomment if building for EPEL
#global name_suffix %%{major_version} #global name_suffix %%{major_version}
@ -139,14 +147,22 @@ BuildRequires: %{_bindir}/sphinx-build
BuildRequires: bzip2-devel BuildRequires: bzip2-devel
BuildRequires: curl-devel BuildRequires: curl-devel
BuildRequires: expat-devel BuildRequires: expat-devel
%if %{with bundled_jsoncpp}
Provides: bundled(jsoncpp)
%else
BuildRequires: jsoncpp-devel BuildRequires: jsoncpp-devel
%endif
%if 0%{?fedora} || 0%{?rhel} >= 7 %if 0%{?fedora} || 0%{?rhel} >= 7
BuildRequires: libarchive-devel BuildRequires: libarchive-devel
%else %else
BuildRequires: libarchive3-devel BuildRequires: libarchive3-devel
%endif %endif
BuildRequires: libuv-devel BuildRequires: libuv-devel
%if %{with bundled_rhash}
Provides: bundled(rhash)
%else
BuildRequires: rhash-devel BuildRequires: rhash-devel
%endif
BuildRequires: xz-devel BuildRequires: xz-devel
BuildRequires: zlib-devel BuildRequires: zlib-devel
BuildRequires: vim-filesystem BuildRequires: vim-filesystem
@ -295,6 +311,12 @@ $SRCDIR/bootstrap --prefix=%{_prefix} --datadir=/share/%{name} \
--docdir=/share/doc/%{name} --mandir=/share/man \ --docdir=/share/doc/%{name} --mandir=/share/man \
--%{?with_bootstrap:no-}system-libs \ --%{?with_bootstrap:no-}system-libs \
--parallel=`/usr/bin/getconf _NPROCESSORS_ONLN` \ --parallel=`/usr/bin/getconf _NPROCESSORS_ONLN` \
%if %{with bundled_rhash}
--no-system-librhash \
%endif
%if %{with bundled_jsoncpp}
--no-system-jsoncpp \
%endif
%if %{with sphinx} %if %{with sphinx}
--sphinx-man --sphinx-html \ --sphinx-man --sphinx-html \
%else %else
@ -512,6 +534,9 @@ mv -f Modules/FindLibArchive.disabled Modules/FindLibArchive.cmake
%changelog %changelog
* Tue Dec 15 2020 Tom Stellard <tstellar@redhat.com> - 3.18.4-4
- Update BuildRequires for eln
* Fri Nov 20 08:32:34 EST 2020 Neal Gompa <ngompa13@gmail.com> - 3.18.4-3 * Fri Nov 20 08:32:34 EST 2020 Neal Gompa <ngompa13@gmail.com> - 3.18.4-3
- Ensure CMake does not strip binaries with package builds - Ensure CMake does not strip binaries with package builds