rpms/subversion/devel subversion.spec,1.116,1.117

[Joe Orton (jorton)]

Author: jorton

Update of /cvs/extras/rpms/subversion/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4338

Modified Files:
	subversion.spec 
Log Message:
* Thu Jul  3 2008 Joe Orton <jorton at redhat.com> 1.5.0-7
- add svnmerge and wcgrep to docdir (Edward Rudd, #451932)
- drop neon version overrides



Index: subversion.spec
===================================================================
RCS file: /cvs/extras/rpms/subversion/devel/subversion.spec,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- subversion.spec	2 Jul 2008 11:30:22 -0000	1.116
+++ subversion.spec	3 Jul 2008 08:14:21 -0000	1.117
@@ -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_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 @@
 %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 @@
 %endif
 
 %changelog
+* Thu Jul  3 2008 Joe Orton <jorton at 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 at redhat.com> 1.5.0-6
 - build with OpenJDK