fix building against Apache 2

subversion/subversion.config.apache

@@ -2,8 +2,8 @@
 ##  subversion.conf -- Apache configuration for Subversion modules
 ##
 
-LoadModule dav_svn_module   @l_prefix@/libexec/apache2/mod_dav_svn.so
-LoadModule authz_svn_module @l_prefix@/libexec/apache2/mod_authz_svn.so
+LoadModule dav_svn_module   @l_prefix@/libexec/apache/mod_dav_svn.so
+LoadModule authz_svn_module @l_prefix@/libexec/apache/mod_authz_svn.so
 
 #<Location /svn/default>
 #    DAV                 svn

subversion/subversion.spec

@@ -46,7 +46,7 @@ Release:      20070622
 #   package options
 %option       with_cvs2svn  no
 %option       with_svn2cvs  no
-%option       with_apache2  no
+%option       with_apache   no
 %option       with_perl     no
 %option       with_python   no
 %option       with_ruby     no
@@ -78,9 +78,9 @@ PreReq:       rcs, python, python::with_dbm = yes
 BuildPreReq:  perl
 PreReq:       perl, perl-xml, cvs, rcs
 %endif
-%if "%{with_apache2}" == "yes"
-BuildPreReq:  apache2, apache2::with_mod_dav = yes
-PreReq:       apache2, apache2::with_mod_dav = yes
+%if "%{with_apache}" == "yes"
+BuildPreReq:  apache, apache::with_mod_dav = yes
+PreReq:       apache, apache::with_mod_dav = yes
 %endif
 %if "%{with_perl}" == "yes" || "%{with_python}" == "yes"
 BuildPreReq:  swig
@@ -169,7 +169,7 @@ AutoReqProv:  no
         --without-gssapi \
         --with-libxml2 \
         --enable-static \
-%if "%{with_apache2}" == "yes"
+%if "%{with_apache}" == "yes"
         --with-apxs \
         --disable-mod-activation \
 %else
@@ -341,13 +341,13 @@ AutoReqProv:  no
         svn2cvs.1 $RPM_BUILD_ROOT%{l_prefix}/man/man1/svn2cvs.1
 %endif
 
-%if "%{with_apache2}" == "yes"
+%if "%{with_apache}" == "yes"
     #   install Apache configuration file
     %{l_shtool} mkdir -f -p -m 755 \
-        $RPM_BUILD_ROOT%{l_prefix}/etc/apache2/apache2.d
+        $RPM_BUILD_ROOT%{l_prefix}/etc/apache/apache.d
     %{l_shtool} install -c -m 644 %{l_value -s -a} \
         %{SOURCE subversion.config.apache} \
-        $RPM_BUILD_ROOT%{l_prefix}/etc/apache2/apache2.d/subversion.conf
+        $RPM_BUILD_ROOT%{l_prefix}/etc/apache/apache.d/subversion.conf
 %endif
 
     #   install run-command script
@@ -383,9 +383,9 @@ AutoReqProv:  no
     [ $1 -eq 2 ] || exit 0
     eval `%{l_rc} subversion status 2>/dev/null`
     [ ".$subversion_active" = .yes ] && %{l_rc} subversion restart
-%if "%{with_apache2}" == "yes"
-    eval `%{l_rc} apache2 status 2>/dev/null`
-    [ ".$apache2_active" = .yes ] && %{l_rc} apache2 restart
+%if "%{with_apache}" == "yes"
+    eval `%{l_rc} apache status 2>/dev/null`
+    [ ".$apache_active" = .yes ] && %{l_rc} apache restart
 %endif
     exit 0