[jython] Fix fetch script.

[Alexander Kurtakov]

commit ab6a6777e299ca40d2a58280e5dde7df62fbc10a
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Thu Mar 6 21:26:36 2014 +0200

    Fix fetch script.
    
    - R java-headless.

 fetch-jython.sh |   19 ++++++++++---------
 jython.spec     |   14 +++++++++-----
 2 files changed, 19 insertions(+), 14 deletions(-)
---
diff --git a/fetch-jython.sh b/fetch-jython.sh
index ca49835..d78d960 100644
--- a/fetch-jython.sh
+++ b/fetch-jython.sh
@@ -1,13 +1,13 @@
 #!/bin/sh
 
-# Generate a source drop for jython from SVN
+# Generate a source drop for jython from Mercurial
 
 # Usage message
-usage="usage: $0 <project_name> <svn_root> <svn_tag>"
+usage="usage: $0 <project_name> <hg_root> <hg_tag>"
 
 project_name=$1
-svn_root=$2
-svn_tag=$3
+hg_root=$2
+hg_tag=$3
 
 # Ensure we got all of the variables
 if [ "x$project_name"x = "xx" ]
@@ -16,13 +16,13 @@ then
         exit 1
 fi
 
-if [ "x$svn_root"x = "xx" ]
+if [ "x$hg_root"x = "xx" ]
 then
         echo >&2 "$usage"
         exit 1
 fi
 
-if [ "x$svn_tag"x = "xx" ]
+if [ "x$hg_tag"x = "xx" ]
 then
         echo >&2 "$usage"
         exit 1
@@ -30,6 +30,7 @@ fi
 
 mkdir -p temp && cd temp
 
-svn export --username guest --password "" $svn_root/$project_name/tags/$svn_tag
-mv $svn_tag/$project_name $project_name-svn-$svn_tag
-tar jcf $project_name-fetched-src-$svn_tag.tar.bz2 $project_name-svn-$svn_tag
+hg clone -r $hg_tag $hg_root
+rm -fr $project_name/.hg*
+mv $project_name $project_name-hg-$hg_tag
+tar Jcf $project_name-fetched-src-$hg_tag.tar.xz $project_name-hg-$hg_tag
\ No newline at end of file
diff --git a/jython.spec b/jython.spec
index 32ebe29..14fd03e 100644
--- a/jython.spec
+++ b/jython.spec
@@ -6,7 +6,7 @@
 
 Name:                      jython
 Version:                   2.2.1
-Release:                   15%{?dist}
+Release:                   16%{?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/
@@ -27,7 +27,7 @@ Patch2:                    jython-dont-validate-pom.patch
 Patch3:                    %{name}-cacheperms.patch
 Patch4:                    %{name}-makeCompiledFilename.patch
 Patch5:                    %{name}-cached-classes.patch
-Requires:                  jpackage-utils
+Requires:                  javapackages-tools
 Requires:                  jakarta-oro
 Requires:                  servlet
 Requires:                  python >= %{cpython_version}
@@ -39,9 +39,9 @@ BuildRequires:             mysql-connector-java
 BuildRequires:             jakarta-oro
 BuildRequires:             python >= %{cpython_version}
 BuildRequires:             servlet
-BuildRequires:             java-devel >= 1:1.6.0
-BuildRequires:             jpackage-utils
-Requires:                  java >= 1:1.6.0
+BuildRequires:             java-devel >= 1:1.7.0
+BuildRequires:             javapackages-tools
+Requires:                  java-headless >= 1:1.7.0
 Group:                     Development/Languages
 
 BuildArch:                 noarch
@@ -240,6 +240,10 @@ EOF
 %doc %{_datadir}/%{name}/Demo
 
 %changelog
+* Thu Mar 6 2014 Alexander Kurtakov <akurtako at redhat.com> 2.2.1-16
+- Fix fetch script.
+- R java-headless.
+
 * Thu Mar 06 2014 Lubomir Rintel (GoodData) <lubo.rintel at gooddata.com> 2.2.1-15
 - Fix CVE-2013-2027