From ae2d876a105f080c82e870d05197068fc1aa74e4 Mon Sep 17 00:00:00 2001
From: jorton <jorton@fedoraproject.org>
Date: Jul 03 2008 08:14:21 +0000
Subject: - add svnmerge and wcgrep to docdir (Edward Rudd, #451932)

- drop neon version overrides

---

diff --git a/subversion.spec b/subversion.spec
index 1a7b26d..f973ee5 100644
--- a/subversion.spec
+++ b/subversion.spec
@@ -15,7 +15,7 @@
 Summary: Modern Version Control System designed to replace CVS
 Name: subversion
 Version: 1.5.0
-Release: 6
+Release: 7
 License: ASL 1.1
 Group: Development/Tools
 URL: http://subversion.tigris.org/
@@ -124,12 +124,11 @@ export svn_cv_ruby_sitedir_libsuffix=""
 export svn_cv_ruby_sitedir_archsuffix=""
 
 export CC=gcc CXX=g++ JAVA_HOME=%{jdk_path}
-export CPPFLAGS="-DSVN_NEON_0_26 -DSVN_NEON_0_25"
 %configure --with-apr=%{_prefix} --with-apr-util=%{_prefix} \
         --with-swig --with-neon=%{_prefix} \
         --with-ruby-sitedir=%{ruby_sitearch} \
         --with-apxs=%{_sbindir}/apxs --disable-mod-activation \
-        --disable-static --disable-neon-version-check
+        --disable-static
 make %{?_smp_mflags} all
 make swig-py swig-py-lib %{swigdirs}
 make swig-pl swig-pl-lib swig-rb swig-rb-lib
@@ -227,6 +226,8 @@ rm -rf ${RPM_BUILD_ROOT}
 %doc BUGS COMMITTERS COPYING HACKING INSTALL README CHANGES
 %doc tools subversion/LICENSE mod_authz_svn-INSTALL
 %doc contrib/client-side/svn_load_dirs/{*.pl,*.example,*.README}
+%doc contrib/client-side/svnmerge/*.{README,py}
+%doc contrib/client-side/wcgrep
 %{_bindir}/*
 %{_libdir}/libsvn_*.so.*
 %{_mandir}/man*/*
@@ -275,6 +276,10 @@ rm -rf ${RPM_BUILD_ROOT}
 %endif
 
 %changelog
+* Thu Jul  3 2008 Joe Orton <jorton@redhat.com> 1.5.0-7
+- add svnmerge and wcgrep to docdir (Edward Rudd, #451932)
+- drop neon version overrides
+
 * Wed Jul  2 2008 Joe Orton <jorton@redhat.com> 1.5.0-6
 - build with OpenJDK