Hello community,
here is the log from the commit of package javapackages-tools for
openSUSE:Factory checked in at 2014-03-21 13:31:17
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/javapackages-tools (Old)
and /work/SRC/openSUSE:Factory/.javapackages-tools.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "javapackages-tools"
Changes:
--------
--- /work/SRC/openSUSE:Factory/javapackages-tools/javapackages-tools.changes
2014-03-10 12:35:26.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.javapackages-tools.new/javapackages-tools.changes
2014-03-21 13:31:18.000000000 +0100
@@ -1,0 +2,7 @@
+Mon Mar 10 13:52:26 UTC 2014 - [email protected]
+
+- maven_depmap-no-attribute-exit.patch: SLES patch for ZipFile
+ having no attribute '__exit__' which was causing ecj build
+ failures
+
+-------------------------------------------------------------------
New:
----
maven_depmap-no-attribute-exit.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ javapackages-tools.spec ++++++
--- /var/tmp/diff_new_pack.BZHjS0/_old 2014-03-21 13:31:18.000000000 +0100
+++ /var/tmp/diff_new_pack.BZHjS0/_new 2014-03-21 13:31:18.000000000 +0100
@@ -34,6 +34,9 @@
Patch0: suse-use-libdir.patch
# PATCH-FIX-UPSTREAM Drain stdin in dependency generator
Patch1: depgen.patch
+# PATCH-FIX-SLE maven_depmap-no-attribute-exit.patch - fix ZipFile instance
has no attribute '__exit__'
+Patch2: maven_depmap-no-attribute-exit.patch
+
#BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: asciidoc
@@ -102,6 +105,9 @@
%setup -q -n javapackages-%{version}
%patch0 -p1
%patch1 -p1
+%if 0%{?suse_version} == 1110
+%patch2 -p1
+%endif
%build
%{configure}
++++++ maven_depmap-no-attribute-exit.patch ++++++
--- javapackages-2.0.1/java-utils/maven_depmap.py 2014-03-10
09:25:02.081196397 -0400
+++ javapackages-2.0.1/java-utils/maven_depmap.py.mod 2014-03-10
09:25:35.499433928 -0400
@@ -236,9 +236,9 @@
# Add a file to a ZIP archive (or JAR, WAR, ...) unless the file
# already exists in the archive. Provided by Tomas Radej.
def append_if_missing(archive_name, file_name, file_contents):
- with ZipFile(archive_name, 'a') as archive:
- if file_name not in archive.namelist():
- archive.writestr(file_name, file_contents)
+ archive = ZipFile(archive_name, 'a')
+ if file_name not in archive.namelist():
+ archive.writestr(file_name, file_contents)
# Inject pom.properties if JAR doesn't have one. This is necessary to
# identify the origin of JAR files that are present in the repository.
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
