mbooth pushed to jython (master). "Update to release candidate 2 (..more)"
notifications at fedoraproject.org
notifications at fedoraproject.org
Wed Apr 8 23:56:45 UTC 2015
>From 5b1fcd89eb2020a2c38431e73ee1f8f8977f0bbe Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth at redhat.com>
Date: Thu, 9 Apr 2015 00:56:11 +0100
Subject: Update to release candidate 2
- Drop jline and libreadline in favour of jline 2
- Resolves: rhbz#1182482 - don't ship windows executables
diff --git a/fetch-jython.sh b/fetch-jython.sh
index 79f56c6..4409a82 100644
--- a/fetch-jython.sh
+++ b/fetch-jython.sh
@@ -11,6 +11,8 @@ hg clone -r "$TAG" https://hg.python.org/jython jython-$TAG
find jython-$TAG -type f -a -name *.jar -delete
find jython-$TAG -type f -a -name *.class -delete
+find jython-$TAG -type f -a -name *.exe -delete
+find jython-$TAG -type f -a -name *.dll -delete
rm -rf jython-$TAG/.hg
tar Jcf jython-$TAG.tar.xz jython-$TAG
diff --git a/jython-dont-validate-pom.patch b/jython-dont-validate-pom.patch
index 65d9174..994eed6 100644
--- a/jython-dont-validate-pom.patch
+++ b/jython-dont-validate-pom.patch
@@ -1,15 +1,15 @@
---- build.xml.orig 2014-05-28 14:23:58.664171578 +0100
-+++ build.xml 2014-05-28 14:25:38.903526513 +0100
-@@ -174,6 +174,9 @@
+--- build.xml.orig 2015-04-08 23:42:46.345303431 +0100
++++ build.xml 2015-04-08 23:44:39.525852992 +0100
+@@ -140,6 +140,9 @@
<!-- classpaths -->
<path id="main.classpath">
+ <fileset dir="${extlibs.dir}">
+ <include name="**/*.jar"/>
+ </fileset>
- <pathelement path="${extlibs.dir}/libreadline-java-0.8.jar" />
<pathelement path="${extlibs.dir}/servlet-api-2.5.jar" />
<pathelement path="${informix.jar}" />
+ <pathelement path="${oracle.jar}" />
--- maven/build.xml.orig 2014-05-30 09:14:45.807566331 +0100
+++ maven/build.xml 2014-05-30 09:20:08.483159086 +0100
@@ -107,8 +107,6 @@
diff --git a/jython.spec b/jython.spec
index 197d589..1c0b354 100644
--- a/jython.spec
+++ b/jython.spec
@@ -1,12 +1,15 @@
%{expand: %%global pyver %(python -c 'import sys;print(sys.version[0:3])')}
%global cpython_version %{pyver}
-%global scm_tag v2.7b4
-%global _python_bytecompile_errors_terminate_build 0
+%global scm_tag v2.7rc2
+
+# Turn off the brp-python-bytecompile script
+# We generate JVM bytecode instead
+%global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g')
Name: jython
Version: 2.7
-Release: 0.3.b4%{?dist}
+Release: 0.4.rc2%{?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/
@@ -22,7 +25,6 @@ Patch0: jython-cachedir.patch
Patch1: jython-dont-validate-pom.patch
Requires: python >= %{cpython_version}
-Requires: libreadline-java >= 0.8.0-16
Requires: antlr32-java
Requires: apache-commons-compress
Requires: guava
@@ -32,17 +34,16 @@ Requires: jnr-ffi
Requires: jnr-netdb
Requires: jnr-posix
Requires: jffi
-Requires: jline1
+Requires: jline >= 2.12.1
+Requires: jansi
Requires: icu4j
Requires: netty
-BuildRequires: java-devel >= 1:1.7.0
# We build with ant, but install with maven
BuildRequires: javapackages-local
BuildRequires: ant
BuildRequires: junit
BuildRequires: glassfish-servlet-api
BuildRequires: python >= %{cpython_version}
-BuildRequires: libreadline-java >= 0.8.0-16
BuildRequires: antlr32-tool
BuildRequires: apache-commons-compress
BuildRequires: guava
@@ -52,7 +53,7 @@ BuildRequires: jnr-ffi
BuildRequires: jnr-netdb
BuildRequires: jnr-posix
BuildRequires: jffi
-BuildRequires: jline1
+BuildRequires: jline >= 2.12.1
BuildArch: noarch
@@ -98,14 +99,13 @@ Demonstrations and samples for %{name}.
%patch0
%patch1
-# Set correct encoding for source
+# Set correct encoding for source to fix javadoc generation
sed -i -e '723i encoding="UTF-8"' build.xml
%build
-build-jar-repository -s extlibs \
+build-jar-repository -p -s extlibs \
antlr32/antlr antlr32/antlr-runtime stringtemplate antlr \
- jnr-constants jnr-ffi jnr-netdb jnr-posix jffi \
- libreadline-java/libreadline-java jline1/jline-1 \
+ jnr-constants jnr-ffi jnr-netdb jnr-posix jffi jline/jline \
glassfish-servlet-api guava objectweb-asm/asm objectweb-asm/asm-commons objectweb-asm/asm-util \
commons-compress junit
@@ -161,22 +161,10 @@ if [ -f \$HOME/.%{name}rc ] ; then
. \$HOME/.%{name}rc
fi
-# Arch-specific location of dependency
-case \$(uname -m) in
- x86_64 | ia64 | s390x | ppc64 | ppc64le | sparc64 | aarch64 )
- JYTHONLIBDIR="/usr/lib64" ;;
- * )
- JYTHONLIBDIR="/usr/lib" ;;
-esac
-
# Configuration
MAIN_CLASS=org.python.util.jython
BASE_FLAGS=-Dpython.home=%{_datadir}/jython
-BASE_JARS="jython/jython guava jnr-constants jnr-ffi jnr-netdb jnr-posix jffi libreadline-java/libreadline-java jline1/jline-1 antlr32/antlr-runtime objectweb-asm/asm objectweb-asm/asm-commons objectweb-asm/asm-util commons-compress icu4j netty/netty-buffer netty/netty-codec netty/netty-common netty/netty-handler netty/netty-transport"
-
-BASE_FLAGS="\$BASE_FLAGS -Dpython.console=org.python.util.ReadlineConsole"
-BASE_FLAGS="\$BASE_FLAGS -Djava.library.path=\$JYTHONLIBDIR/libreadline-java"
-BASE_FLAGS="\$BASE_FLAGS -Dpython.console.readlinelib=Editline"
+BASE_JARS="jython/jython guava jnr-constants jnr-ffi jnr-netdb jnr-posix jffi jline/jline jansi/jansi antlr32/antlr-runtime objectweb-asm/asm objectweb-asm/asm-commons objectweb-asm/asm-util commons-compress icu4j netty/netty-buffer netty/netty-codec netty/netty-common netty/netty-handler netty/netty-transport"
# Set parameters
set_jvm
@@ -208,6 +196,11 @@ EOF
%{_datadir}/%{name}/Demo
%changelog
+* Wed Apr 08 2015 Mat Booth <mat.booth at redhat.com> - 2.7-0.4.rc2
+- Update to release candidate 2
+- Drop jline and libreadline in favour of jline 2
+- Resolves: rhbz#1182482 - don't ship windows executables
+
* Fri Jan 9 2015 Alexander Kurtakov <akurtako at redhat.com> 2.7-0.3.b4
- Update to beta 4.
diff --git a/sources b/sources
index b099542..913509b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0ee61620e71a00cebda58588608d6f76 jython-v2.7b4.tar.xz
+0fb52f5e57b1bd274ed84e36da5a19d2 jython-v2.7rc2.tar.xz
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/jython.git/commit/?h=master&id=5b1fcd89eb2020a2c38431e73ee1f8f8977f0bbe
More information about the scm-commits
mailing list