@@ -61,21 +61,12 @@

 #%patch4 -p1 

 %build

-# No configure script is present, it is all done via make flags

-# Kernels of Fedora 11 and up and EL 6 and up are newer than 2.6.28,

-# so using linux2628 as target.

-

-# Recommended optimization option for x86 builds

-regparm_opts=

-%ifarch %ix86 x86_64

-regparm_opts="USE_REGPARM=1"

-%endif

-make %{?_smp_mflags} CPU="generic" TARGET="linux2628" USE_PCRE=1 ${regparm_opts} ADDINC="%{optflags}" USE_LINUX_TPROXY=1 USE_OPENSSL="1"

+make %{?_smp_mflags}  USE_PCRE=1 ${regparm_opts} USE_LINUX_TPROXY=1 USE_OPENSSL="1"

 # build the halog contrib program.

 pushd contrib/halog

-make OPTIMIZE="%{optflags}"

+make

 popd

 %install

@@ -90,8 +81,8 @@

 %{__install} -d -m 0755 %{buildroot}%{_bindir}

 %{__install} -p -m 0755 ./contrib/halog/halog %{buildroot}%{_bindir}/halog

-%{__install} -p -D -m 0755 %{SOURCE6} %{buildroot}%{haproxy_sampledir}

-%{__install} -p -D -m 0755 %{SOURCE7} %{buildroot}%{haproxy_sampledir}

+mv %{SOURCE6} %{buildroot}%{haproxy_sampledir}

+mv %{SOURCE7} %{buildroot}%{haproxy_sampledir}

​