From 33ea74e6bb49c0a0c9bc9121d9ebcb62aa8d0116 Mon Sep 17 00:00:00 2001
From: jorton <jorton@fedoraproject.org>
Date: Wed, 24 Nov 2004 09:42:14 +0000
Subject: [PATCH] - update subversion.conf examples to be SELinux-friendly

---
 subversion.conf | 25 +++++++++++++++++++------
 subversion.spec |  5 ++++-
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/subversion.conf b/subversion.conf
index 2094092..ff34ee1 100644
--- a/subversion.conf
+++ b/subversion.conf
@@ -3,14 +3,27 @@ LoadModule dav_svn_module     modules/mod_dav_svn.so
 LoadModule authz_svn_module   modules/mod_authz_svn.so
 
 #
-# Example configuration to enable HTTP access for a Subversion
-# repository, "/home/svnroot".  This repository must be readable
-# and writable by the 'apache' user.
-# 
+# Example configuration to enable HTTP access for a directory
+# containing Subversion repositories, "/var/www/svn".  Each repository
+# must be readable and writable by the 'apache' user.  Note that if
+# SELinux is enabled, the repositories must be labelled with a context
+# which httpd can write to; this will happen by default for
+# directories created in /var/www.  Use "restorecon -R /var/www/svn"
+# to label the repositories if upgrading from a previous release.
+#
 
-#<Location /svn/repos>
+#
+# To create a new repository using this scheme, say, 
+# http://localhost/repos/stuff, run as root:
+#
+#   # cd /var/www/svn
+#   # svnadmin create stuff   
+#   # chown -R apache.apache stuff
+#
+
+#<Location /repos>
 #   DAV svn
-#   SVNPath /home/svnroot
+#   SVNParentPath /var/www/svn
 #
 #   # Limit write permission to list of valid users.
 #   <LimitExcept GET PROPFIND OPTIONS REPORT>
diff --git a/subversion.spec b/subversion.spec
index c8cd9d1..feb4914 100644
--- a/subversion.spec
+++ b/subversion.spec
@@ -6,7 +6,7 @@
 Summary: Modern Version Control System designed to replace CVS
 Name: subversion
 Version: 1.1.1
-Release: 4
+Release: 5
 License: BSD
 Group: Development/Tools
 URL: http://subversion.tigris.org/
@@ -196,6 +196,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/man*/*::*
 
 %changelog
+* Wed Nov 24 2004 Joe Orton <jorton@redhat.com> 1.1.1-5
+- update subversion.conf examples to be SELinux-friendly
+
 * Thu Nov 11 2004 Jeff Johnson <jbj@jbj.org> 1.1.1-4
 - rebuild against db-4.3.21.
 - x86_64: don't fail "make check" while diagnosing db-4.3.21 upgrade.