[jython/jython252rc3] Update to 2.5.2rc3.

[Andrew Overholt]

commit 770d7bef27cc2aaf8ff8ef8ebe4b80faeb43a6e5
Author: Andrew Overholt <overholt at redhat.com>
Date:   Sat Jan 29 18:54:33 2011 -0500

    Update to 2.5.2rc3.

 jython-2.5.2rc3-cpythonlicenselocation.patch      |   12 ++++++++++++
 jython-2.5.2rc3-nocheckoutforbrandingreadme.patch |   12 ++++++++++++
 jython.spec                                       |   15 ++++++++++-----
 3 files changed, 34 insertions(+), 5 deletions(-)
---
diff --git a/jython-2.5.2rc3-cpythonlicenselocation.patch b/jython-2.5.2rc3-cpythonlicenselocation.patch
new file mode 100644
index 0000000..038c3ad
--- /dev/null
+++ b/jython-2.5.2rc3-cpythonlicenselocation.patch
@@ -0,0 +1,12 @@
+diff -up jython-svn-Release_2_5_2rc3/build.xml jython-svn-Release_2_5_2rc3/build.xml
+--- jython-svn-Release_2_5_2rc3/build.xml	2011-01-29 16:23:32.698320843 -0700
++++ jython-svn-Release_2_5_2rc3/build.xml	2011-01-29 16:28:48.491320843 -0700
+@@ -699,7 +699,7 @@ The readme text for the next release wil
+ 
+     <target name="copy-license" if="do.checkout">
+         <echo>copy CPython LICENSE from ${svn.checkout.dir}/python</echo>
+-        <copy file="${svn.checkout.dir}/python/LICENSE" tofile="${dist.dir}/LICENSE_CPython.txt" preservelastmodified="true" />
++        <copy file="${cpython.license.file}" tofile="${dist.dir}/LICENSE_CPython.txt" preservelastmodified="true" />
+     </target>
+ 
+     <target name="copy-full" depends="copy-lib, copy-license" if="full-build">
diff --git a/jython-2.5.2rc3-nocheckoutforbrandingreadme.patch b/jython-2.5.2rc3-nocheckoutforbrandingreadme.patch
new file mode 100644
index 0000000..6a1392b
--- /dev/null
+++ b/jython-2.5.2rc3-nocheckoutforbrandingreadme.patch
@@ -0,0 +1,12 @@
+diff -up jython-svn-Release_2_5_2rc3/build.xml jython-svn-Release_2_5_2rc3/build.xml
+--- jython-svn-Release_2_5_2rc3/build.xml	2011-01-29 16:36:15.827320842 -0700
++++ jython-svn-Release_2_5_2rc3/build.xml	2011-01-29 16:36:43.528320843 -0700
+@@ -419,7 +419,7 @@ jython.build.time=${build.time}
+ jython.build.svn_revision=${build.svn.revision}</echo>
+     </target>
+ 
+-    <target name="brand-readme-version" depends="checkout" if="do.snapshot.build">
++    <target name="brand-readme-version">
+         <!-- change README.txt version string, if so defined: used for
+         snapshot builds. XXX: a bit broken for now-->
+         <replace file="${jython.base.dir}/README.txt" token='2.5a3+'
diff --git a/jython.spec b/jython.spec
index d0bee76..6f87fa2 100644
--- a/jython.spec
+++ b/jython.spec
@@ -19,10 +19,10 @@ URL:                       http://www.jython.org/
 Source0:                   %{name}-fetched-src-%{svn_tag}.tar.bz2
 Source2:                   fetch-%{name}.sh
 Patch0:                    %{name}-2.5.2rc3-cachedirinhomedir.patch
-# Make javadoc and copy-full tasks not depend upon "full-build"
-# Also, copy python's license from source directory and not
-# ${python.home}
-Patch1:                    %{name}-2.5.2rc3-usejythonlicenseandnofullbuildpath.patch
+# Use installed Python LICENSE file
+Patch1:                    %{name}-2.5.2rc3-cpythonlicenselocation.patch
+# Don't force an SVN checkout to add version to README
+Patch2:                    %{name}-2.5.2rc3-nocheckoutforbrandingreadme.patch
 Requires:                  jpackage-utils >= 0:1.5
 Requires:                  oro
 Requires:                  servlet
@@ -88,6 +88,7 @@ Demonstrations and samples for %{name}.
 %setup -q -n %{name}-svn-%{svn_tag}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 export CLASSPATH=$(build-classpath mysql-connector-java oro servlet)
@@ -105,7 +106,11 @@ ant \
   -Dpython.exe=%{_bindir}/python \
   -DPyXmlHome=%{_libdir}/python%pyver \
   -Dtargetver=1.3 \
-  copy-dist
+  -Ddo.checkout=false \
+  -Dsvn.code.dir=%{name}-svn-%{svn_tag} \
+  -Djython.base.dir=$(pwd) \
+  -Dcpython.license.file=%{_defaultdocdir}/python-%{pyver}/LICENSE
+  brand-readme-version jar javadoc
 
 
 # remove #! from python files