From de106c6ac6399fa2c91e7acdad622272b411a916 Mon Sep 17 00:00:00 2001
From: Joe Orton <jorton@redhat.com>
Date: Thu, 19 Apr 2012 09:19:07 +0100
Subject: [PATCH] adapt for conf.modules.d with httpd 2.4

- add possible workaround for kwallet crasher (#810861)
Resolves: rhbz#810861
---
 subversion.spec | 28 +++++++++++++++++++++++-----
 1 file changed, 23 insertions(+), 5 deletions(-)

diff --git a/subversion.spec b/subversion.spec
index e4f7b7e..e02d8a7 100644
--- a/subversion.spec
+++ b/subversion.spec
@@ -13,11 +13,14 @@
 
 %{!?_httpd_apxs: %{expand: %%global _httpd_apxs %%{_sbindir}/apxs}}
 %{!?_httpd_mmn: %{expand: %%global _httpd_mmn %%(cat %{_includedir}/httpd/.mmn || echo missing-httpd-devel)}}
+%{!?_httpd_confdir:    %{expand: %%global _httpd_confdir    %%{_sysconfdir}/httpd/conf.d}}
+# /etc/httpd/conf.d with httpd < 2.4 and defined as /etc/httpd/conf.modules.d with httpd >= 2.4
+%{!?_httpd_modconfdir: %{expand: %%global _httpd_modconfdir %%{_sysconfdir}/httpd/conf.d}}
 
 Summary: A Modern Concurrent Version Control System
 Name: subversion
 Version: 1.7.4
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: ASL 2.0
 Group: Development/Tools
 URL: http://subversion.apache.org/
@@ -234,9 +237,17 @@ make pure_vendor_install -C subversion/bindings/swig/perl/native \
         PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
 install -m 755 -d ${RPM_BUILD_ROOT}%{_sysconfdir}/subversion
 
-# Add subversion.conf configuration file into httpd/conf.d directory.
-install -m 755 -d ${RPM_BUILD_ROOT}%{_sysconfdir}/httpd/conf.d
-install -m 644 $RPM_SOURCE_DIR/subversion.conf ${RPM_BUILD_ROOT}%{_sysconfdir}/httpd/conf.d
+mkdir -p ${RPM_BUILD_ROOT}{%{_httpd_modconfdir},%{_httpd_confdir}}
+
+%if "%{_httpd_modconfdir}" == "%{_httpd_confdir}"
+# httpd <= 2.2.x
+install -p -m 644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_httpd_confdir}
+%else
+sed -n /^LoadModule/p %{SOURCE1} > 10-subversion.conf
+sed    /^LoadModule/d %{SOURCE1} > example.conf
+touch -r %{SOURCE1} 10-subversion.conf example.conf
+install -p -m 644 10-subversion.conf ${RPM_BUILD_ROOT}%{_httpd_modconfdir}
+%endif
 
 # Remove unpackaged files
 rm -rf ${RPM_BUILD_ROOT}%{_includedir}/subversion-*/*.txt \
@@ -436,8 +447,11 @@ fi
 
 %files -n mod_dav_svn
 %defattr(-,root,root)
-%config(noreplace) %{_sysconfdir}/httpd/conf.d/subversion.conf
+%config(noreplace) %{_httpd_modconfdir}/*.conf
 %{_libdir}/httpd/modules/mod_*.so
+%if "%{_httpd_modconfdir}" != "%{_httpd_confdir}"
+%doc example.conf
+%endif
 
 %files perl
 %defattr(-,root,root,-)
@@ -459,6 +473,10 @@ fi
 %endif
 
 %changelog
+* Thu Apr 19 2012 Joe Orton <jorton@redhat.com> - 1.7.4-4
+- adapt for conf.modules.d with httpd 2.4
+- add possible workaround for kwallet crasher (#810861)
+
 * Fri Mar 30 2012 Joe Orton <jorton@redhat.com> - 1.7.4-3
 - re-enable test suite