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

Fix path of contrib/admin tools

Browse Source
This commit is contained in:
Ryan O'Hara 2021-05-17 11:52:39 -05:00
parent 13d0c522f6
commit 318e522383
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
haproxy.spec
View File

@ -8,7 +8,7 @@
Name: haproxy Name: haproxy
Version: 2.4.0 Version: 2.4.0
Release: 3%{?dist} Release: 4%{?dist}
Summary: HAProxy reverse proxy for high availability environments Summary: HAProxy reverse proxy for high availability environments
License: GPLv2+ 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}" %{__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} admin/halog/halog OPTIMIZE="%{optflags} %{build_ldflags}"
%{__make} ${halog} OPTIMIZE="%{optflags} %{build_ldflags}" %{__make} admin/iprange/iprange OPTIMIZE="%{optflags} %{build_ldflags}"
popd %{__make} admin/iprange/ip6range OPTIMIZE="%{optflags} %{build_ldflags}"
pushd contrib/iprange
%{__make} iprange OPTIMIZE="%{optflags} %{build_ldflags}"
popd
%install %install
%{__make} install-bin DESTDIR=%{buildroot} PREFIX=%{_prefix} TARGET="linux2628" %{__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_homedir}
%{__install} -d -m 0755 %{buildroot}%{haproxy_datadir} %{__install} -d -m 0755 %{buildroot}%{haproxy_datadir}
%{__install} -d -m 0755 %{buildroot}%{_bindir} %{__install} -d -m 0755 %{buildroot}%{_bindir}
%{__install} -p -m 0755 ./contrib/halog/halog %{buildroot}%{_bindir}/halog %{__install} -p -m 0755 ./admin/halog/halog %{buildroot}%{_bindir}/halog
%{__install} -p -m 0755 ./contrib/iprange/iprange %{buildroot}%{_bindir}/iprange %{__install} -p -m 0755 ./admin/iprange/iprange %{buildroot}%{_bindir}/iprange
%{__install} -p -m 0644 ./examples/errorfiles/* %{buildroot}%{haproxy_datadir} %{__install} -p -m 0755 ./admin/iprange/ip6range %{buildroot}%{_bindir}/ip6range
for httpfile in $(find ./examples/errorfiles/ -type f) for httpfile in $(find ./examples/errorfiles/ -type f)
do do
@ -129,9 +125,13 @@ exit 0
%{_sbindir}/%{name} %{_sbindir}/%{name}
%{_bindir}/halog %{_bindir}/halog
%{_bindir}/iprange %{_bindir}/iprange
%{_bindir}/ip6range
%{_mandir}/man1/* %{_mandir}/man1/*
%changelog %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 * Mon May 17 2021 Ryan O'Hara <rohara@redhat.com> - 2.4.0-3
- Use SLZ instead of ZLIB - Use SLZ instead of ZLIB