[jython/f21] Update to latest upstream release
Mat Booth
mbooth at fedoraproject.org
Thu Jul 31 15:33:11 UTC 2014
commit 5a8e778ba187bf7ff703dc0985bff54ad354dcd1
Author: Mat Booth <mat.booth at redhat.com>
Date: Thu Jul 31 16:32:19 2014 +0100
Update to latest upstream release
- Drop no longer needed patches
- Add aarch64 support to launcher script
jython-CVE-2013-2027.patch | 10 +-
jython-dont-validate-pom.patch | 8 +-
jython-new-asm.patch | 256 ----------------------------------------
jython-new-guava.patch | 117 ------------------
jython-new-jnr.patch | 183 ----------------------------
jython.spec | 45 +++----
sources | 2 +-
7 files changed, 30 insertions(+), 591 deletions(-)
---
diff --git a/jython-CVE-2013-2027.patch b/jython-CVE-2013-2027.patch
index bd132cf..7933b38 100644
--- a/jython-CVE-2013-2027.patch
+++ b/jython-CVE-2013-2027.patch
@@ -56,15 +56,15 @@
this.cachedir = aCachedir1;
return true;
---- src/org/python/core/PySystemState.java.orig 2014-05-28 11:59:22.970242503 +0100
-+++ src/org/python/core/PySystemState.java 2014-05-28 12:00:56.459733020 +0100
-@@ -951,6 +951,12 @@
- Py.newString(Version.getHGVersion()));
+--- src/org/python/core/PySystemState.java.orig 2014-07-31 10:39:48.478125592 +0100
++++ src/org/python/core/PySystemState.java 2014-07-31 10:47:10.647338683 +0100
+@@ -1098,6 +1098,12 @@
+ long_info = LongInfo.getInfo();
}
+ public static File classCache() {
+ if (cachedir == null)
-+ return null;
++ return null;
+ return new File(cachedir, "classes");
+ }
+
diff --git a/jython-dont-validate-pom.patch b/jython-dont-validate-pom.patch
index 35f5732..65d9174 100644
--- a/jython-dont-validate-pom.patch
+++ b/jython-dont-validate-pom.patch
@@ -8,11 +8,11 @@
+ <include name="**/*.jar"/>
+ </fileset>
<pathelement path="${extlibs.dir}/libreadline-java-0.8.jar" />
- <pathelement path="${extlibs.dir}/jline-0.9.95-SNAPSHOT.jar" />
<pathelement path="${extlibs.dir}/servlet-api-2.5.jar" />
+ <pathelement path="${informix.jar}" />
--- maven/build.xml.orig 2014-05-30 09:14:45.807566331 +0100
+++ maven/build.xml 2014-05-30 09:20:08.483159086 +0100
-@@ -103,8 +103,6 @@
+@@ -107,8 +107,6 @@
<move file="${build.dir}/@{install.name}.jar"
tofile="@{install.dir}/@{install.name}.jar"/>
@@ -21,7 +21,7 @@
<checksum algorithm="SHA1" fileext=".sha1">
<fileset dir="@{install.dir}" excludes="*.sha1,*.md5,*.tmp"/>
-@@ -155,31 +153,6 @@
+@@ -159,31 +157,6 @@
<copy file="${dist.base}/@{artifactId}.jar"
tofile="${build.dir}/@{artifactId}-${project.version}.jar"/>
@@ -53,7 +53,7 @@
</sequential>
</macrodef>
-@@ -204,5 +177,5 @@
+@@ -208,5 +181,5 @@
<ant antfile="build.xml" target="all-jars"/>
</target>
diff --git a/jython.spec b/jython.spec
index c84cc83..08e64c1 100644
--- a/jython.spec
+++ b/jython.spec
@@ -1,12 +1,12 @@
%{expand: %%global pyver %(python -c 'import sys;print(sys.version[0:3])')}
%global cpython_version %{pyver}
-%global scm_tag v2.5.3
+%global scm_tag v2.7b3
%global _python_bytecompile_errors_terminate_build 0
Name: jython
-Version: 2.5.3
-Release: 4%{?dist}
+Version: 2.7
+Release: 0.1.b3%{?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,16 +22,11 @@ Patch0: jython-cachedir.patch
Patch1: jython-dont-validate-pom.patch
# This addresses CVE-2013-2027 (http://bugs.jython.org/msg8004)
Patch2: jython-CVE-2013-2027.patch
-# This is backported from upstream to support the newer version of jnr in Fedora
-Patch3: jython-new-jnr.patch
-# This is backported from upstream to support the newer version of guava in Fedora
-Patch4: jython-new-guava.patch
-# This is backported from upstream to support the newer version of asm in Fedora
-Patch5: jython-new-asm.patch
Requires: python >= %{cpython_version}
Requires: libreadline-java >= 0.8.0-16
Requires: antlr32-java
+Requires: apache-commons-compress
Requires: guava
Requires: objectweb-asm
Requires: jnr-constants
@@ -48,6 +43,7 @@ BuildRequires: glassfish-servlet-api
BuildRequires: python >= %{cpython_version}
BuildRequires: libreadline-java >= 0.8.0-16
BuildRequires: antlr32-tool
+BuildRequires: apache-commons-compress
BuildRequires: guava
BuildRequires: objectweb-asm
BuildRequires: jnr-constants
@@ -100,17 +96,17 @@ Demonstrations and samples for %{name}.
%patch0
%patch1
%patch2
-%patch3 -p1
-%patch4 -p1
-%patch5
+
+# Set correct encoding for source
+sed -i -e '476i encoding="UTF-8"' -e '715i Encoding="UTF-8"' build.xml
%build
build-jar-repository -s extlibs \
antlr32/antlr antlr32/antlr-runtime stringtemplate antlr \
jnr-constants jnr-ffi jnr-posix jffi \
libreadline-java/libreadline-java jline1/jline-1 \
- glassfish-servlet-api guava objectweb-asm/asm objectweb-asm/asm-commons \
- junit
+ glassfish-servlet-api guava objectweb-asm/asm objectweb-asm/asm-commons objectweb-asm/asm-util \
+ commons-compress junit
ant \
-Djython.dev.jar=jython.jar \
@@ -131,11 +127,8 @@ popd
%install
# install maven artifacts
-%mvn_install
+%mvn_install -J dist/Doc/javadoc
-# javadoc
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -pr dist/Doc/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
# data
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}
# these are not supposed to be distributed
@@ -144,8 +137,7 @@ cp -pr dist/Lib $RPM_BUILD_ROOT%{_datadir}/%{name}
# demo
cp -pr Demo $RPM_BUILD_ROOT%{_datadir}/%{name}
# manual
-rm -rf dist/Doc/javadoc
-cp -pr dist/Doc $RPM_BUILD_ROOT%{_datadir}/%{name}
+cp -pr Doc $RPM_BUILD_ROOT%{_datadir}/%{name}
# registry
install -m 644 registry $RPM_BUILD_ROOT%{_datadir}/%{name}
@@ -170,7 +162,7 @@ fi
# Arch-specific location of dependency
case \$(uname -m) in
- x86_64 | ia64 | s390x | ppc64 | ppc64le | sparc64 )
+ x86_64 | ia64 | s390x | ppc64 | ppc64le | sparc64 | aarch64 )
JYTHONLIBDIR="/usr/lib64" ;;
* )
JYTHONLIBDIR="/usr/lib" ;;
@@ -179,7 +171,7 @@ esac
# Configuration
MAIN_CLASS=org.python.util.jython
BASE_FLAGS=-Dpython.home=%{_datadir}/jython
-BASE_JARS="jython/jython guava jnr-constants jnr-ffi jnr-posix jffi jline1/jline-1 antlr32/antlr-runtime objectweb-asm/asm objectweb-asm/asm-commons"
+BASE_JARS="jython/jython guava jnr-constants jnr-ffi 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"
BASE_FLAGS="\$BASE_FLAGS -Dpython.console=org.python.util.ReadlineConsole"
BASE_FLAGS="\$BASE_FLAGS -Djava.library.path=\$JYTHONLIBDIR/libreadline-java"
@@ -187,7 +179,6 @@ BASE_FLAGS="\$BASE_FLAGS -Dpython.console.readlinelib=Editline"
# Set parameters
set_jvm
-CLASSPATH=\$CLASSPATH:\$JYTHONLIBDIR/libreadline-java/libreadline-java.jar
set_classpath \$BASE_JARS
set_flags \$BASE_FLAGS
set_options \$BASE_OPTIONS
@@ -204,9 +195,8 @@ EOF
%{_datadir}/%{name}/Lib
%{_datadir}/%{name}/registry
-%files javadoc
+%files javadoc -f .mfiles-javadoc
%doc LICENSE.txt
-%{_javadocdir}/%{name}
%files manual
%doc LICENSE.txt
@@ -217,6 +207,11 @@ EOF
%{_datadir}/%{name}/Demo
%changelog
+* Thu Jul 31 2014 Mat Booth <mat.booth at redhat.com> - 2.7-0.1.b3
+- Update to latest upstream release
+- Drop no longer needed patches
+- Add aarch64 support to launcher script
+
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.5.3-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
diff --git a/sources b/sources
index 5ee42a7..582da30 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fa2806e003c83ddbdcd00ad1a9e976a3 jython-v2.5.3.tar.xz
+6b6bb79b7a0bc852404c457de6792581 jython-v2.7b3.tar.xz
More information about the scm-commits
mailing list