ViewVC Help
View File | Revision Log | Show Annotations | Root Listing
root/cvsroot/COMP/CMSDIST/apache.spec
(Generate patch)

Comparing COMP/CMSDIST/apache.spec (file contents):
Revision 1.7 by steen, Tue May 16 21:50:35 2006 UTC vs.
Revision 1.10 by ratnik, Wed Apr 18 23:46:01 2007 UTC

# Line 1 | Line 1
1 < ### RPM external apache 2.0.55
1 > ### RPM external apache 2.0.59
2 > Requires: gcc-wrapper
3   %define downloadn httpd
4 < Source: http://mirror1.zic-network.ch/apache/%{downloadn}/%{downloadn}-%{v}.tar.gz
5 < Requires: zlib openssl
4 > Source: http://apache.osuosl.org/httpd/httpd-%v.tar.gz
5 > Requires: zlib openssl expat
6   %prep
7   %setup -n %{downloadn}-%{v}
8  
9   %build
10 < ./configure --prefix=%{i} \
10 > ## IMPORT gcc-wrapper
11 > ./configure CFLAGS="-I$EXPAT_ROOT/include" \
12 >            LDFLAGS="-L$EXPAT_ROOT/lib" \
13 >            --prefix=%{i} \
14              --with-z=$LIBZ_ROOT \
15              --with-ssl=$OPENSSL_ROOT \
16              --enable-ssl \
# Line 20 | Line 24 | make %makeprocesses
24   %initenv
25   mkdir -p %{i}
26   true || exit 0
23
24
27   make install
28  
29 + echo 'Include '"%i/conf.d/"'*.conf' >> \
30 +  %i/conf/httpd.conf
31  
28 mkdir -p %i/conf.d
29
30 #--------------------------------------------------------------------
31 mkdir -p %i/etc/profile.d
32 cat << DEPS_SETUP > %i/etc/profile.d/dependencies-setup.sh
33 #!/bin/sh
34
35 temp_line=\$(grep 'Include[ \t]*[^ ]*/conf.d/\*.conf' \
36           \$APACHE_ROOT/conf/httpd.conf)
37
38 if [ -z "\$temp_line" ]
39 then
40  echo "Inserting Include statement"
41  echo 'Include '"\$APACHE_ROOT/conf.d/"'*.conf' >> \
42  \$APACHE_ROOT/conf/httpd.conf
43 fi
44
45 DEPS_SETUP
32  
33   %post
34   %{relocateConfig}conf/highperformance.conf

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines