[jython/jython252rc3: 1/3] Update to 2.5.2rc3. Make patches apply.

[Andrew Overholt]

commit d8b754aff86dd82b3cd761322d1897e3a32d6451
Author: Andrew Overholt <overholt at redhat.com>
Date:   Sat Jan 29 17:38:55 2011 -0500

    Update to 2.5.2rc3.  Make patches apply.

 jython-2.5.2rc3-cachedirinhomedir.patch            |   18 ++++++++++++++++++
 ...5.2rc3-usejythonlicenseandnofullbuildpath.patch |   16 ++++++++++++++++
 jython.spec                                        |   17 ++++++++++-------
 3 files changed, 44 insertions(+), 7 deletions(-)
---
diff --git a/jython-2.5.2rc3-cachedirinhomedir.patch b/jython-2.5.2rc3-cachedirinhomedir.patch
new file mode 100644
index 0000000..54464cd
--- /dev/null
+++ b/jython-2.5.2rc3-cachedirinhomedir.patch
@@ -0,0 +1,18 @@
+diff -up jython-svn-Release_2_5_2rc3/src/org/python/core/PySystemState.java jython-svn-Release_2_5_2rc3/src/org/python/core/PySystemState.java
+--- jython-svn-Release_2_5_2rc3/src/org/python/core/PySystemState.java	2011-01-29 15:27:37.293320843 -0700
++++ jython-svn-Release_2_5_2rc3/src/org/python/core/PySystemState.java	2011-01-29 15:31:03.703320843 -0700
+@@ -961,7 +961,13 @@ public class PySystemState extends PyObj
+         }
+         cachedir = new File(props.getProperty(PYTHON_CACHEDIR, CACHEDIR_DEFAULT_NAME));
+         if (!cachedir.isAbsolute()) {
+-            cachedir = new File(prefix == null ? null : prefix.toString(), cachedir.getPath());
++            File jythondir = new File(System.getProperty("user.home"), ".jython-cache");
++
++            if (!jythondir.isDirectory()) {
++                jythondir.mkdirs();
++            }
++
++            cachedir = new File(jythondir, cachedir.getPath());
+         }
+     }
+ 
diff --git a/jython-2.5.2rc3-usejythonlicenseandnofullbuildpath.patch b/jython-2.5.2rc3-usejythonlicenseandnofullbuildpath.patch
new file mode 100644
index 0000000..a388972
--- /dev/null
+++ b/jython-2.5.2rc3-usejythonlicenseandnofullbuildpath.patch
@@ -0,0 +1,16 @@
+diff -up ./jython-svn-Release_2_5_2rc3/build.xml.fullbuild ./jython-svn-Release_2_5_2rc3/build.xml
+--- ./jython-svn-Release_2_5_2rc3/build.xml.fullbuild	2011-01-29 15:34:15.648320843 -0700
++++ ./jython-svn-Release_2_5_2rc3/build.xml	2011-01-29 15:35:02.954320849 -0700
+@@ -699,10 +699,10 @@ 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="LICENSE.txt" tofile="${dist.dir}/LICENSE_CPython.txt" preservelastmodified="true" />
+     </target>
+ 
+-    <target name="copy-full" depends="copy-lib, copy-license" if="full-build">
++    <target name="copy-full" depends="copy-lib, copy-license">
+         <echo>copy misc files from ${jython.base.dir}</echo>
+         <copy todir="${dist.dir}" preservelastmodified="true" overwrite="true">
+             <fileset dir="${jython.base.dir}"
diff --git a/jython.spec b/jython.spec
index fed9b86..d0bee76 100644
--- a/jython.spec
+++ b/jython.spec
@@ -2,27 +2,27 @@
 
 %global cpython_version    %{pyver}
 %global pyxml_version      0.8.3
-%global svn_tag            Release_2_2_1
+%global svn_tag            Release_2_5_2rc3
 %global _python_bytecompile_errors_terminate_build 0
 
 Name:                      jython
-Version:                   2.2.1
-Release:                   4.7%{?dist}
+Version:                   2.5.2
+Release:                   0.1.rc3%{?dist}
 Summary:                   A Java implementation of the Python language
 License:                   ASL 1.1 and BSD and CNRI and JPython and Python
 URL:                       http://www.jython.org/
 # Use the included fetch-jython.sh script to generate the source drop
-# for jython 2.2.1
+# for jython 2.5.2rc3
 # sh fetch-jython.sh \
-#   jython https://jython.svn.sourceforge.net/svnroot Release_2_2_1
+#   jython https://jython.svn.sourceforge.net/svnroot Release_2_5_2rc3
 #
 Source0:                   %{name}-fetched-src-%{svn_tag}.tar.bz2
 Source2:                   fetch-%{name}.sh
-Patch0:                    %{name}-cachedir.patch
+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}-nofullbuildpath.patch
+Patch1:                    %{name}-2.5.2rc3-usejythonlicenseandnofullbuildpath.patch
 Requires:                  jpackage-utils >= 0:1.5
 Requires:                  oro
 Requires:                  servlet
@@ -238,6 +238,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_datadir}/%{name}/Demo
 
 %changelog
+* Sat Jan 29 2011 Andrew Overholt <overholt at redhat.com> 2.5.2-0.1.rc3
+- Update to 2.5.2rc3.
+
 * Wed Aug 11 2010 Andrew Overholt <overholt at redhat.com> 2.2.1-4.7
 - Rebuild with Python 2.7.