Logoj0ke.net Open Build Service > Projects > internetx:projects:http > haproxy > Changes
Sign Up | Log In

Changes of Revision 39

[-] Changed haproxy.spec
x
 
1
@@ -25,10 +25,10 @@
2
 Source6:   sample-configs.tgz
3
 Source7:   haproxy_munin.tgz
4
 
5
-Patch1:        0001-Add-ability-to-externalize-health-check.patch
6
-Patch2:        0001-enhance-hash-type-directive-with-algorithm-options.patch
7
-Patch3:        0002-implement-avalanche-as-modifier.patch
8
-Patch4:        haproxy-1.5-geolocation.patch
9
+#Patch1:       0001-Add-ability-to-externalize-health-check.patch
10
+#Patch2:       0001-enhance-hash-type-directive-with-algorithm-options.patch
11
+#Patch3:       0002-implement-avalanche-as-modifier.patch
12
+#Patch4:       haproxy-1.5-geolocation.patch
13
 
14
 
15
 BuildRequires:  pcre-devel, openssl-devel
16
@@ -61,8 +61,13 @@
17
 #%patch4 -p1 
18
 
19
 %build
20
-
21
-make %{?_smp_mflags} TARGET=linux26  USE_PCRE=1 ${regparm_opts} USE_LINUX_TPROXY=1 USE_OPENSSL="1"
22
+%if 0%{?centos_version} == 700
23
+make %{?_smp_mflags} TARGET=linux2628  USE_PCRE=1 USE_LINUX_TPROXY=1 USE_OPENSSL="1"
24
+%elif 0%{?rhel_version} == 700
25
+make %{?_smp_mflags} TARGET=linux2628  USE_PCRE=1 USE_LINUX_TPROXY=1 USE_OPENSSL="1"
26
+%else
27
+make %{?_smp_mflags} TARGET=linux28  USE_PCRE=1 ${regparm_opts} USE_LINUX_TPROXY=1 USE_OPENSSL="1"
28
+%endif
29
 
30
 # build the halog contrib program.
31
 pushd contrib/halog
32
@@ -92,7 +97,7 @@
33
     %{__install} -p -m 0644 $httpfile %{buildroot}%{haproxy_datadir}
34
 done
35
 
36
-# convert all text files to utf8
37
+'# convert all text files to utf8
38
 for textfile in $(find ./ -type f -name '*.txt')
39
 do
40
     mv $textfile $textfile.old
41