rpms/rrdtool
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Used macros for make

Browse Source
This commit is contained in:
Jaroslav Škarvada 2020-07-23 17:00:47 +02:00
parent 44add9f787
commit 1516f8eab4
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
rrdtool.spec
View File

@ -18,7 +18,7 @@
Summary: Round Robin Database Tool to store and display time-series data Summary: Round Robin Database Tool to store and display time-series data
Name: rrdtool Name: rrdtool
Version: 1.7.2 Version: 1.7.2
Release: 11%{?dist} Release: 12%{?dist}
License: GPLv2+ with exceptions License: GPLv2+ with exceptions
URL: http://oss.oetiker.ch/rrdtool/ URL: http://oss.oetiker.ch/rrdtool/
Source0: http://oss.oetiker.ch/%{name}/pub/%{name}-%{version}.tar.gz 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 perl -pi.orig -e 's|/lib/perl|/%{_lib}/perl|g' Makefile
popd popd
#{__make} %{?_smp_mflags} %{make_build}
make
# Build the php module, the tmp install is required # Build the php module, the tmp install is required
%if %{with_php} %if %{with_php}
%global rrdtmp %{_tmppath}/%{name}-%{version}-tmpinstall %global rrdtmp %{_tmppath}/%{name}-%{version}-tmpinstall
make install DESTDIR="%{rrdtmp}" %{__make} install DESTDIR="%{rrdtmp}"
pushd php4/ pushd php4/
export PYTHON=%{__python3} export PYTHON=%{__python3}
@ -244,8 +243,7 @@ export PYTHON=%{__python3}
%configure \ %configure \
--with-rrdtool="%{rrdtmp}%{_prefix}" \ --with-rrdtool="%{rrdtmp}%{_prefix}" \
--disable-static --disable-static
#{__make} %{?_smp_mflags} %{make_build} PYTHON="$PYTHON"
make PYTHON="$PYTHON"
popd popd
rm -rf %{rrdtmp} rm -rf %{rrdtmp}
%endif %endif
@ -263,7 +261,7 @@ popd
%install %install
export PYTHON=%{__python3} export PYTHON=%{__python3}
make DESTDIR="$RPM_BUILD_ROOT" PYTHON="$PYTHON" install %{make_install} PYTHON="$PYTHON"
# Install the php module # Install the php module
%if %{with_php} %if %{with_php}
@ -395,6 +393,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} php -n \
%endif %endif
%changelog %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 * Tue Jun 30 2020 Miro Hrončok <mhroncok@redhat.com> - 1.7.2-11
- Rebuilt for Lua 5.4 - Rebuilt for Lua 5.4