From 4a7680275770fd5cc5a799d1bcbdaacd9fbc7c1a Mon Sep 17 00:00:00 2001
From: Carl George <carl@george.computer>
Date: Oct 12 2022 19:29:52 +0000
Subject: Don't use macro forms of system executables


https://docs.fedoraproject.org/en-US/packaging-guidelines/#_macros

---

diff --git a/haproxy.spec b/haproxy.spec
index 5b5952e..ebb83a3 100644
--- a/haproxy.spec
+++ b/haproxy.spec
@@ -52,46 +52,46 @@ availability environments. Indeed, it can:
 %setup -q
 %build
 
-%{__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 DEFINE=-DMAX_SESS_STKCTR=12 ADDINC="%{build_cflags}" ADDLIB="%{build_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 DEFINE=-DMAX_SESS_STKCTR=12 ADDINC="%{build_cflags}" ADDLIB="%{build_ldflags}"
 
-%{__make} admin/halog/halog ADDINC="%{build_cflags}" ADDLIB="%{build_ldflags}"
+make admin/halog/halog ADDINC="%{build_cflags}" ADDLIB="%{build_ldflags}"
 
 pushd admin/iprange
-%{__make} OPTIMIZE="%{build_cflags}" LDFLAGS="%{build_ldflags}"
+make OPTIMIZE="%{build_cflags}" LDFLAGS="%{build_ldflags}"
 popd
 
 %install
-%{__make} install-bin DESTDIR=%{buildroot} PREFIX=%{_prefix} TARGET="linux2628"
-%{__make} install-man DESTDIR=%{buildroot} PREFIX=%{_prefix}
-
-%{__install} -p -D -m 0644 %{SOURCE1} %{buildroot}%{_unitdir}/%{name}.service
-%{__install} -p -D -m 0644 %{SOURCE2} %{buildroot}%{haproxy_confdir}/%{name}.cfg
-%{__install} -p -D -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
-%{__install} -p -D -m 0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/sysconfig/%{name}
-%{__install} -p -D -m 0644 %{SOURCE5} %{buildroot}%{_sysusersdir}/%{name}.conf
-%{__install} -p -D -m 0644 %{SOURCE6} %{buildroot}%{_mandir}/man1/halog.1
-%{__install} -d -m 0755 %{buildroot}%{haproxy_homedir}
-%{__install} -d -m 0755 %{buildroot}%{haproxy_datadir}
-%{__install} -d -m 0755 %{buildroot}%{haproxy_confdir}/conf.d
-%{__install} -d -m 0755 %{buildroot}%{_bindir}
-%{__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
+make install-bin DESTDIR=%{buildroot} PREFIX=%{_prefix} TARGET="linux2628"
+make install-man DESTDIR=%{buildroot} PREFIX=%{_prefix}
+
+install -p -D -m 0644 %{SOURCE1} %{buildroot}%{_unitdir}/%{name}.service
+install -p -D -m 0644 %{SOURCE2} %{buildroot}%{haproxy_confdir}/%{name}.cfg
+install -p -D -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
+install -p -D -m 0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/sysconfig/%{name}
+install -p -D -m 0644 %{SOURCE5} %{buildroot}%{_sysusersdir}/%{name}.conf
+install -p -D -m 0644 %{SOURCE6} %{buildroot}%{_mandir}/man1/halog.1
+install -d -m 0755 %{buildroot}%{haproxy_homedir}
+install -d -m 0755 %{buildroot}%{haproxy_datadir}
+install -d -m 0755 %{buildroot}%{haproxy_confdir}/conf.d
+install -d -m 0755 %{buildroot}%{_bindir}
+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
-    %{__install} -p -m 0644 $httpfile %{buildroot}%{haproxy_datadir}
+    install -p -m 0644 $httpfile %{buildroot}%{haproxy_datadir}
 done
 
-%{__rm} -rf ./examples/errorfiles/
+rm -rf ./examples/errorfiles/
 
-find ./examples/* -type f ! -name "*.cfg" -exec %{__rm} -f "{}" \;
+find ./examples/* -type f ! -name "*.cfg" -exec rm -f "{}" \;
 
 for textfile in $(find ./ -type f -name '*.txt')
 do
-    %{__mv} $textfile $textfile.old
+    mv $textfile $textfile.old
     iconv --from-code ISO8859-1 --to-code UTF-8 --output $textfile $textfile.old
-    %{__rm} -f $textfile.old
+    rm -f $textfile.old
 done
 
 %pre