Hello community,
here is the log from the commit of package jython for openSUSE:Factory
checked in at Mon Mar 14 10:32:42 CET 2011.
--------
--- jython/jython.changes 2011-02-22 12:07:24.000000000 +0100
+++ /mounts/work_src_done/STABLE/jython/jython.changes 2011-03-11 14:04:16.000000000 +0100
@@ -1,0 +2,6 @@
+Fri Mar 11 13:01:53 UTC 2011 - mvyskocil@suse.cz
+
+- Update to 2.2.1 - this obsolete the pyxml patch
+- merge with jython-2.2.1-6.fc16.src.rpm
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
jython-cvs.tar.bz2
jython-new-xml.diff
python-release22-maint-cvs.tar.bz2
New:
----
fetch-jython.sh
jython-fetched-src-Release_2_2_1.tar.bz2
jython-nofullbuildpath.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ jython.spec ++++++
--- /var/tmp/diff_new_pack.7gnLOD/_old 2011-03-14 09:51:57.000000000 +0100
+++ /var/tmp/diff_new_pack.7gnLOD/_new 2011-03-14 09:51:57.000000000 +0100
@@ -15,34 +15,51 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
+%{expand: %%define pyver %(python -c 'import sys;print(sys.version[0:3])')}
+
+%global cpython_version %{pyver}
+%global pyxml_version 0.8.3
+%global svn_tag Release_2_2_1
+%global _python_bytecompile_errors_terminate_build 0
Name: jython
-BuildRequires: ant ht2html java2-devel-packages libreadline-java mysql-connector-java oro pyxml servletapi5
-%{expand: %%define pyver %(python -c 'import sys;print(sys.version[0:3])')}
-%define name jython
-%define version 2.2
-%define cpython_version 2.3
-%define cpythondir python%{cpython_version}
-%define pyxml_version 0.8.3
-%define release 0.a0.2jpp
-%define section free
-Version: 2.2
-Release: 326
-Summary: Java Source Interpreter
-License: Other uncritical OpenSource License ; Apache Software License
+Version: 2.2.1
+Release: 1
+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/
-Source0: %{name}-cvs.tar.bz2
-Source1: python-release22-maint-cvs.tar.bz2
+Group: Development/Languages/Python
+# Use the included fetch-jython.sh script to generate the source drop
+# for jython 2.2.1
+# sh fetch-jython.sh \
+# jython https://jython.svn.sourceforge.net/svnroot Release_2_2_1
+#
+Source0: %{name}-fetched-src-%{svn_tag}.tar.bz2
+Source2: fetch-%{name}.sh
Patch0: %{name}-cachedir.patch
-Patch1: jython-new-xml.diff
+# 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
Requires: jpackage-utils >= 1.5
-Requires: oro
-Requires: servlet
-Group: Development/Libraries/Java
-BuildArch: noarch
+Requires: jakarta-oro
+Requires: servletapi5
+Requires: python >= %{cpython_version}
+Requires: libreadline-java >= 0.8.0-16
+Requires: mysql-connector-java
+Requires: java >= 1.6.0
+BuildRequires: ant
+BuildRequires: ht2html
+BuildRequires: libreadline-java >= 0.8.0-16
+BuildRequires: mysql-connector-java
+BuildRequires: jakarta-oro
+BuildRequires: python >= %{cpython_version}
+BuildRequires: pyxml >= %{pyxml_version}
+BuildRequires: servletapi5
+BuildRequires: java-devel >= 1.6.0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+BuildArch: noarch
%description
Jython is an implementation of the high-level, dynamic, object-oriented
@@ -63,10 +80,8 @@
Java allows developers to freely mix the two languages both during
development and in shipping products.
-
-
%package manual
-License: Other uncritical OpenSource License ; Apache Software License
+License: ASL 1.1 and BSD and CNRI and JPython and Python
Summary: Manual for jython
Group: Development/Libraries/Java
@@ -94,8 +109,7 @@
%package javadoc
-License: Other uncritical OpenSource License ; Apache Software License
-PreReq: coreutils
+License: ASL 1.1 and BSD and CNRI and JPython and Python
Summary: Javadoc for jython
Group: Development/Libraries/Java
@@ -123,7 +137,7 @@
%package demo
-License: Other uncritical OpenSource License ; Apache Software License
+License: ASL 1.1 and BSD and CNRI and JPython and Python
Summary: Demonstration and samples for jython
Requires: %{name} = %{version}-%{release}
Group: Development/Libraries/Java
@@ -152,99 +166,116 @@
%prep
-%setup -q -n %{name}
-%setup -q -n %{name} -T -D -a 1
+%setup -q -n %{name}-svn-%{svn_tag}
%patch0 -p1
%patch1 -p1
-# remove all binary libs
-find . -name "*.jar" -exec rm -f {} \;
-# remove all CVS files
-for dir in `find . -type d -name CVS`; do rm -rf $dir; done
-for file in `find . -type f -name .cvsignore`; do rm -rf $file; done
%build
-export CLASSPATH=$(build-classpath libreadline-java mysql-connector-java oro servlet)
+export CLASSPATH=$(build-classpath mysql-connector-java oro servlet)
+# FIXME: fix jpackage-utils to handle multilib correctly
+export CLASSPATH=$CLASSPATH:%{_libdir}/libreadline-java/libreadline-java.jar
+
rm -rf org/apache
-if ! grep -q "javac.*source=" build.xml ; then
- perl -p -i -e 's|