Changes - j0ke.net Open Build Service

[-] [+]	Changed	haproxy.spec
@@ -25,10 +25,10 @@ Source6: sample-configs.tgz Source7: haproxy_munin.tgz -Patch1: 0001-Add-ability-to-externalize-health-check.patch -Patch2: 0001-enhance-hash-type-directive-with-algorithm-options.patch -Patch3: 0002-implement-avalanche-as-modifier.patch -Patch4: haproxy-1.5-geolocation.patch +#Patch1: 0001-Add-ability-to-externalize-health-check.patch +#Patch2: 0001-enhance-hash-type-directive-with-algorithm-options.patch +#Patch3: 0002-implement-avalanche-as-modifier.patch +#Patch4: haproxy-1.5-geolocation.patch BuildRequires: pcre-devel, openssl-devel @@ -61,8 +61,13 @@ #%patch4 -p1 %build - -make %{?_smp_mflags} TARGET=linux26 USE_PCRE=1 ${regparm_opts} USE_LINUX_TPROXY=1 USE_OPENSSL="1" +%if 0%{?centos_version} == 700 +make %{?_smp_mflags} TARGET=linux2628 USE_PCRE=1 USE_LINUX_TPROXY=1 USE_OPENSSL="1" +%elif 0%{?rhel_version} == 700 +make %{?_smp_mflags} TARGET=linux2628 USE_PCRE=1 USE_LINUX_TPROXY=1 USE_OPENSSL="1" +%else +make %{?_smp_mflags} TARGET=linux28 USE_PCRE=1 ${regparm_opts} USE_LINUX_TPROXY=1 USE_OPENSSL="1" +%endif # build the halog contrib program. pushd contrib/halog @@ -92,7 +97,7 @@ %{__install} -p -m 0644 $httpfile %{buildroot}%{haproxy_datadir} done -# convert all text files to utf8 +'# convert all text files to utf8 for textfile in $(find ./ -type f -name '*.txt') do mv $textfile $textfile.old