From d0d9f73253c76ae4d18e84ddd70fa7e27125902d Mon Sep 17 00:00:00 2001
From: jorton <jorton@fedoraproject.org>
Date: Thu, 8 Sep 2005 15:49:25 +0000
Subject: [PATCH] - update to 1.2.3 - merge subversion.conf changes from RHEL4
 - merge filter-requires.sh changes from FC4 updates

---
 filter-requires.sh |  4 ++++
 mirrors            |  2 +-
 sources            |  2 +-
 subversion.conf    | 18 +++++++-----------
 subversion.spec    | 12 ++++++++++--
 upstream           |  2 +-
 6 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/filter-requires.sh b/filter-requires.sh
index f562c53..26131c9 100755
--- a/filter-requires.sh
+++ b/filter-requires.sh
@@ -2,8 +2,12 @@
 # Munge Perl requirements:
 # - remove dependency on Config::Inifiles
 # - only require File::Path >= 1.04, not >= 1.404
+#   (since rpmvercmp thinks 04 < 1.404, not unreasonably)
+# - filter out requirements for SVN:: modules; otherwise
+#   subversion requires subversion-perl
 /usr/lib/rpm/perl.req $* | 
 sed -e '/perl(Config::IniFiles)/d' \
+    -e '/perl(SVN::/d' \
     -e 's/perl(File::Path) >= 1.0404/perl(File::Path) >= 1.04/'
 
     
diff --git a/mirrors b/mirrors
index bb12745..4ffcd1d 100644
--- a/mirrors
+++ b/mirrors
@@ -1 +1 @@
-http://subversion.tigris.org/downloads
+http://subversion.tigris.org/tarballs
diff --git a/sources b/sources
index ddfba60..0068dc0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-01c3742745d50d4395684a4fb2908c5f  subversion-1.2.1.tar.gz
+95f9b43801b4d9bc071564bca2116763  subversion-1.2.3.tar.gz
diff --git a/subversion.conf b/subversion.conf
index 4190b3b..16ea5d2 100644
--- a/subversion.conf
+++ b/subversion.conf
@@ -5,21 +5,17 @@ LoadModule authz_svn_module   modules/mod_authz_svn.so
 #
 # 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 newly created directories in /var/www.  Use the command
-# "restorecon -R /var/www/svn" to label the repositories if migrating
-# from a system without SELinux enabled; to label a repository outside
-# /var/www, use "chcon -R -h -t httpd_sys_content_t /path/to/repos".
+# 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.
 #
 
 #
-# To create a new repository using this scheme, say, 
-# http://localhost/repos/stuff, run as root:
+# To create a new repository "http://localhost/repos/stuff" using
+# this configuration, run as root:
 #
-#   # mkdir /var/www/svn
 #   # cd /var/www/svn
 #   # svnadmin create stuff   
 #   # chown -R apache.apache stuff
diff --git a/subversion.spec b/subversion.spec
index 046b81e..1b2cb2d 100644
--- a/subversion.spec
+++ b/subversion.spec
@@ -17,7 +17,7 @@
 
 Summary: Modern Version Control System designed to replace CVS
 Name: subversion
-Version: 1.2.1
+Version: 1.2.3
 Release: 3
 License: BSD
 Group: Development/Tools
@@ -31,7 +31,7 @@ Patch2: subversion-0.20.1-deplibs.patch
 Patch3: subversion-0.31.0-rpath.patch
 Patch6: subversion-1.0.3-pie.patch
 Patch7: subversion-1.1.3-java.patch
-BuildRequires: autoconf, libtool, python, python-devel, texinfo
+BuildRequires: autoconf, libtool, python, python-devel, texinfo, which
 BuildRequires: db4-devel >= 4.1.25, swig >= 1.3.20-1, docbook-style-xsl
 BuildRequires: apr-devel >= 0.9.6-1, apr-util-devel >= 0.9.5-1
 BuildRequires: neon-devel >= 0:0.24.7-1
@@ -250,6 +250,14 @@ rm -rf ${RPM_BUILD_ROOT}
 %endif
 
 %changelog
+* Thu Sep  8 2005 Joe Orton <jorton@redhat.com> 1.2.3-3
+- update to 1.2.3
+- merge subversion.conf changes from RHEL4
+- merge filter-requires.sh changes from FC4 updates
+
+* Mon Aug  8 2005 Joe Orton <jorton@redhat.com> 1.2.1-4
+- add BR for which (#161015)
+
 * Fri Jul 22 2005 Joe Orton <jorton@redhat.com> 1.2.0-3
 - update to 1.2.1
 - fix BuildRequires for ruby and apr-util (#163126)
diff --git a/upstream b/upstream
index c87bf57..ca90399 100644
--- a/upstream
+++ b/upstream
@@ -1 +1 @@
-subversion-1.2.1.tar.gz
+subversion-1.2.3.tar.gz