Used macros for make
This commit is contained in:
parent
44add9f787
commit
1516f8eab4
15
rrdtool.spec
15
rrdtool.spec
@ -18,7 +18,7 @@
|
||||
Summary: Round Robin Database Tool to store and display time-series data
|
||||
Name: rrdtool
|
||||
Version: 1.7.2
|
||||
Release: 11%{?dist}
|
||||
Release: 12%{?dist}
|
||||
License: GPLv2+ with exceptions
|
||||
URL: http://oss.oetiker.ch/rrdtool/
|
||||
Source0: http://oss.oetiker.ch/%{name}/pub/%{name}-%{version}.tar.gz
|
||||
@ -230,13 +230,12 @@ perl Makefile.PL INSTALLDIRS=vendor
|
||||
perl -pi.orig -e 's|/lib/perl|/%{_lib}/perl|g' Makefile
|
||||
popd
|
||||
|
||||
#{__make} %{?_smp_mflags}
|
||||
make
|
||||
%{make_build}
|
||||
|
||||
# Build the php module, the tmp install is required
|
||||
%if %{with_php}
|
||||
%global rrdtmp %{_tmppath}/%{name}-%{version}-tmpinstall
|
||||
make install DESTDIR="%{rrdtmp}"
|
||||
%{__make} install DESTDIR="%{rrdtmp}"
|
||||
pushd php4/
|
||||
|
||||
export PYTHON=%{__python3}
|
||||
@ -244,8 +243,7 @@ export PYTHON=%{__python3}
|
||||
%configure \
|
||||
--with-rrdtool="%{rrdtmp}%{_prefix}" \
|
||||
--disable-static
|
||||
#{__make} %{?_smp_mflags}
|
||||
make PYTHON="$PYTHON"
|
||||
%{make_build} PYTHON="$PYTHON"
|
||||
popd
|
||||
rm -rf %{rrdtmp}
|
||||
%endif
|
||||
@ -263,7 +261,7 @@ popd
|
||||
|
||||
%install
|
||||
export PYTHON=%{__python3}
|
||||
make DESTDIR="$RPM_BUILD_ROOT" PYTHON="$PYTHON" install
|
||||
%{make_install} PYTHON="$PYTHON"
|
||||
|
||||
# Install the php module
|
||||
%if %{with_php}
|
||||
@ -395,6 +393,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} php -n \
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Thu Jul 23 2020 Jaroslav Škarvada <jskarvad@redhat.com> - 1.7.2-12
|
||||
- Used macros for make
|
||||
|
||||
* Tue Jun 30 2020 Miro Hrončok <mhroncok@redhat.com> - 1.7.2-11
|
||||
- Rebuilt for Lua 5.4
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user