Fix path of contrib/admin tools
This commit is contained in:
parent
13d0c522f6
commit
318e522383
22
haproxy.spec
22
haproxy.spec
@ -8,7 +8,7 @@
|
||||
|
||||
Name: haproxy
|
||||
Version: 2.4.0
|
||||
Release: 3%{?dist}
|
||||
Release: 4%{?dist}
|
||||
Summary: HAProxy reverse proxy for high availability environments
|
||||
|
||||
License: GPLv2+
|
||||
@ -57,13 +57,9 @@ regparm_opts="USE_REGPARM=1"
|
||||
|
||||
%{__make} %{?_smp_mflags} CPU="generic" TARGET="linux-glibc" USE_OPENSSL=1 USE_PCRE2=1 USE_SLZ=1 USE_LUA=1 USE_CRYPT_H=1 USE_SYSTEMD=1 USE_LINUX_TPROXY=1 USE_GETADDRINFO=1 USE_PROMEX=1 ${regparm_opts} ADDINC="%{optflags}" ADDLIB="%{__global_ldflags}"
|
||||
|
||||
pushd contrib/halog
|
||||
%{__make} ${halog} OPTIMIZE="%{optflags} %{build_ldflags}"
|
||||
popd
|
||||
|
||||
pushd contrib/iprange
|
||||
%{__make} iprange OPTIMIZE="%{optflags} %{build_ldflags}"
|
||||
popd
|
||||
%{__make} admin/halog/halog OPTIMIZE="%{optflags} %{build_ldflags}"
|
||||
%{__make} admin/iprange/iprange OPTIMIZE="%{optflags} %{build_ldflags}"
|
||||
%{__make} admin/iprange/ip6range OPTIMIZE="%{optflags} %{build_ldflags}"
|
||||
|
||||
%install
|
||||
%{__make} install-bin DESTDIR=%{buildroot} PREFIX=%{_prefix} TARGET="linux2628"
|
||||
@ -77,9 +73,9 @@ popd
|
||||
%{__install} -d -m 0755 %{buildroot}%{haproxy_homedir}
|
||||
%{__install} -d -m 0755 %{buildroot}%{haproxy_datadir}
|
||||
%{__install} -d -m 0755 %{buildroot}%{_bindir}
|
||||
%{__install} -p -m 0755 ./contrib/halog/halog %{buildroot}%{_bindir}/halog
|
||||
%{__install} -p -m 0755 ./contrib/iprange/iprange %{buildroot}%{_bindir}/iprange
|
||||
%{__install} -p -m 0644 ./examples/errorfiles/* %{buildroot}%{haproxy_datadir}
|
||||
%{__install} -p -m 0755 ./admin/halog/halog %{buildroot}%{_bindir}/halog
|
||||
%{__install} -p -m 0755 ./admin/iprange/iprange %{buildroot}%{_bindir}/iprange
|
||||
%{__install} -p -m 0755 ./admin/iprange/ip6range %{buildroot}%{_bindir}/ip6range
|
||||
|
||||
for httpfile in $(find ./examples/errorfiles/ -type f)
|
||||
do
|
||||
@ -129,9 +125,13 @@ exit 0
|
||||
%{_sbindir}/%{name}
|
||||
%{_bindir}/halog
|
||||
%{_bindir}/iprange
|
||||
%{_bindir}/ip6range
|
||||
%{_mandir}/man1/*
|
||||
|
||||
%changelog
|
||||
* Mon May 17 2021 Ryan O'Hara <rohara@redhat.com> - 2.4.0-4
|
||||
- Fix path of contrib/admin tools
|
||||
|
||||
* Mon May 17 2021 Ryan O'Hara <rohara@redhat.com> - 2.4.0-3
|
||||
- Use SLZ instead of ZLIB
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user