From 975b53d0400564ecab922277d8a9194e1fcf16a9 Mon Sep 17 00:00:00 2001
From: cvsdist <cvsdist@fedoraproject.org>
Date: Sep 09 2004 12:48:18 +0000
Subject: auto-import subversion-0.37.0-1 from subversion-0.37.0-1.src.rpm


---

diff --git a/.cvsignore b/.cvsignore
index 635e917..0614417 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-subversion-0.32.1.tar.gz
+subversion-0.37.0.tar.gz
diff --git a/sources b/sources
index a2d03cb..8df660d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b06717a8ef50db4b5c4d380af00bd901  subversion-0.32.1.tar.gz
+048c4d17d5880dc8f3699020eac56224  subversion-0.37.0.tar.gz
diff --git a/subversion.spec b/subversion.spec
index bea269b..3f3d376 100644
--- a/subversion.spec
+++ b/subversion.spec
@@ -2,26 +2,19 @@
 # set make_check to 0.
 %define make_check 1
 
-ExcludeArch: ppc64 s390 s390x ia64
-
 Summary: A Concurrent Versioning system similar to, but better than, CVS.
 Name: subversion
-Version: 0.32.1
-Release: 5
+Version: 0.37.0
+Release: 1
 License: BSD
 Group: Development/Tools
 URL: http://subversion.tigris.org
-
 Source0: http://subversion.tigris.org/tarballs/subversion-%{version}.tar.gz
 Source1: subversion.conf
 Source3: filter-requires.sh
-
 Patch1: subversion-0.24.2-swig.patch
 Patch2: subversion-0.20.1-deplibs.patch
 Patch3: subversion-0.31.0-rpath.patch
-Patch5: subversion-0.32.1-CAN-2004-0397.patch
-Patch6: subversion-0.32.1-CAN-2004-0413.patch
-
 BuildPreReq: autoconf, libtool, python, python-devel
 BuildPreReq: db4-devel >= 4.1.25, swig >= 1.3.15, docbook-style-xsl
 BuildPreReq: apr-devel, apr-util-devel, neon-devel >= 0:0.24.0-1
@@ -54,7 +47,7 @@ package.
 %package -n mod_dav_svn
 Group: System Environment/Daemons
 Summary: Apache server module for Subversion server.
-Requires: httpd-mmn = %(cat %{_includedir}/httpd/.mmn || echo httpd-devel missing)
+Requires: httpd-mmn = %(cat %{_includedir}/httpd/.mmn || echo missing)
 Requires: subversion = %{version}-%{release}
 BuildPreReq: httpd-devel >= 2.0.45
 
@@ -64,25 +57,25 @@ using HTTP, via the Apache httpd server.
 
 %prep
 %setup -q
-
 %patch1 -p1 -b .swig
 %patch2 -p1 -b .deplibs
 %patch3 -p1 -b .rpath
-%patch5 -p0 -b .can0397
-%patch6 -p1 -b .can0413
 
 rm -rf neon apr apr-util db4
 
 %build
 ./autogen.sh
 
+# requirement for apr 0.9.5 seems to be bogus
+perl -pi -e 's/\.\[5-9\]/\.\[4-9\]/' configure
+
 # fix shebang lines, #111498
 perl -pi -e 's|/usr/bin/env perl -w|/usr/bin/perl -w|' tools/hook-scripts/*.pl.in
 
+export CC=gcc CXX=g++
 %configure --with-apr=%{_prefix} --with-apr-util=%{_prefix} \
 	--with-swig --with-neon=%{_prefix} \
-        --with-apxs=%{_sbindir}/apxs --disable-mod-activation \
-        CC=gcc CXX=g++
+        --with-apxs=%{_sbindir}/apxs --disable-mod-activation
 make %{?_smp_mflags} all swig-py %{swigdirs}
 
 %install
@@ -126,7 +119,7 @@ rm -rf ${RPM_BUILD_ROOT}
 %doc doc/book/book/book.html doc/book/book/images
 %{_bindir}/*
 %{_libdir}/libsvn_*.so.*
-%{_mandir}/man1/*
+%{_mandir}/man*/*
 %{pydir}/svn
 %{pydir}/libsvn
 %{pydir}/rcsparse
@@ -144,16 +137,40 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_libdir}/httpd/modules/mod_authz_svn.so
 
 %changelog
-* Wed Jun  9 2004 Joe Orton <jorton@redhat.com> 0.32.1-5
-- add security fix for CVE CAN-2004-0413 (Ben Reser)
+* Sat Jan 24 2004 Joe Orton <jorton@redhat.com> 0.37.0-1
+- update to 0.37.0
+
+* Tue Jan 13 2004 Joe Orton <jorton@redhat.com> 0.36.0-1
+- update to 0.36.0
 
-* Wed May 12 2004 Joe Orton <jorton@redhat.com> 0.32.1-2
-- add security fix for CVE CAN-2004-0397 (Ben Reser)
+* Thu Jan  8 2004 Joe Orton <jorton@redhat.com> 0.35.1-1
+- update to 0.35.1
+- fix shebang lines in hook scripts (#111498)
+
+* Sat Dec 13 2003 Jeff Johnson <jbj@jbj.org> 0.34.0-3
+- rebuild against db-4.2.52.
+
+* Thu Dec  4 2003 Joe Orton <jorton@redhat.com> 0.34.0-2
+- package all man pages
+
+* Thu Dec 04 2003 Joe Orton <jorton@redhat.com> 0.34.0-1
+- update to 0.34.0
+
+* Thu Nov 13 2003 Joe Orton <jorton@redhat.com> 0.32.1-3
+- remove workarounds for #109268 and #109267
+
+* Thu Nov  6 2003 Joe Orton <jorton@redhat.com> 0.32.1-2
+- rebuild for Python 2.3.2
+- remove libtool workaround
+- add workarounds for #109268 and #109267
 
 * Fri Oct 24 2003 Joe Orton <jorton@redhat.com> 0.32.1-1
 - update to 0.31.2
 - work around libtool/ppc64/db4 confusion
 
+* Mon Oct 13 2003 Jeff Johnson <jbj@jbj.org> 0.31.0-2.1
+- rebuild against db-4.2.42.
+
 * Fri Oct 10 2003 Joe Orton <jorton@redhat.com> 0.31.0-2
 - include The Book
 - don't add an RPATH for libdir to executables