Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package apache-ivy for openSUSE:Factory
checked in at 2024-01-30 18:24:55
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/apache-ivy (Old)
and /work/SRC/openSUSE:Factory/.apache-ivy.new.1815 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "apache-ivy"
Tue Jan 30 18:24:55 2024 rev:24 rq:1142746 version:2.5.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/apache-ivy/apache-ivy.changes 2023-09-21
22:13:23.075822306 +0200
+++ /work/SRC/openSUSE:Factory/.apache-ivy.new.1815/apache-ivy.changes
2024-01-30 18:25:08.073334858 +0100
@@ -1,0 +2,8 @@
+Mon Oct 30 15:24:39 UTC 2023 - Fridrich Strba <fst...@suse.com>
+
+- Added patch:
+ * apache-ivy-pack200.patch
+ + conditionally apply to allow building against standalone
+ pack200 implementation
+
+-------------------------------------------------------------------
New:
----
apache-ivy-pack200.patch
BETA DEBUG BEGIN:
New:- Added patch:
* apache-ivy-pack200.patch
+ conditionally apply to allow building against standalone
BETA DEBUG END:
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ apache-ivy.spec ++++++
--- /var/tmp/diff_new_pack.8r7W2K/_old 2024-01-30 18:25:08.689357082 +0100
+++ /var/tmp/diff_new_pack.8r7W2K/_new 2024-01-30 18:25:08.689357082 +0100
@@ -20,6 +20,7 @@
%bcond_without oro
%bcond_without sftp
%bcond_without vfs
+%bcond_with pack200
Name: apache-ivy
Version: 2.5.2
Release: 0
@@ -32,6 +33,7 @@
Source2:
https://repo1.maven.org/maven2/org/apache/ivy/ivy/%{version}/ivy-%{version}.pom
Patch0: apache-ivy-global-settings.patch
Patch1: apache-ivy-publication-date.patch
+Patch2: apache-ivy-pack200.patch
BuildRequires: ant
BuildRequires: bouncycastle-pg
BuildRequires: fdupes
@@ -39,10 +41,14 @@
BuildRequires: javapackages-local >= 6
BuildRequires: jsch
BuildRequires: oro
-BuildConflicts: java-devel >= 14
Provides: ivy = %{version}-%{release}
Obsoletes: ivy < %{version}-%{release}
BuildArch: noarch
+%if %{with pack200}
+BuildRequires: pack200
+%else
+BuildConflicts: java-devel >= 14
+%endif
%if %{with vfs}
BuildRequires: apache-commons-vfs2
%endif
@@ -117,21 +123,26 @@
rm src/java/org/apache/ivy/plugins/resolver/SshResolver.java
%endif
+%if %{with pack200}
+%pom_add_dep io.pack200:pack200:14:provided
+%patch2 -p1
+%endif
+
%build
# Craft class path
mkdir -p lib
build-jar-repository -s lib ant ant/ant-nodeps jsch bcprov bcpg
export CLASSPATH=$(build-classpath ant ant/ant-nodeps jsch httpcomponents
bcprov bcpg)
%if %{with httpclient}
-build-jar-repository lib httpcomponents
+build-jar-repository -s lib httpcomponents
export CLASSPATH=${CLASSPATH}:$(build-classpath httpcomponents)
%endif
%if %{with oro}
-build-jar-repository lib oro
+build-jar-repository -s lib oro
export CLASSPATH=${CLASSPATH}:$(build-classpath oro)
%endif
%if %{with vfs}
-build-jar-repository lib commons-vfs2
+build-jar-repository -s lib commons-vfs2
export CLASSPATH=${CLASSPATH}:$(build-classpath commons-vfs2)
%endif
%if %{with sftp}
@@ -140,6 +151,10 @@
jsch.agentproxy.jsch
export CLASSPATH=${CLASSPATH}:$(build-classpath jsch.agentproxy.core
jsch.agentproxy.connector-factory jsch.agentproxy.jsch)
%endif
+%if %{with pack200}
+build-jar-repository -s lib pack200
+export CLASSPATH=${CLASSPATH}:$(build-classpath pack200)
+%endif
# Build
%{ant} -v -Dtarget.ivy.version=%{version} -Dbundle.version=%{version}
/localivy /offline jar javadoc
++++++ apache-ivy-pack200.patch ++++++
--- apache-ivy-2.5.2/build.xml 2023-10-30 16:09:23.892302634 +0100
+++ apache-ivy-2.5.2/build.xml 2023-10-30 16:12:01.143389848 +0100
@@ -185,6 +185,7 @@
<javac srcdir="${src.dir}"
destdir="${core.classes.build.dir}"
sourcepath=""
+ classpathref="lib.classpath"
source="${ivy.minimum.javaversion}"
target="${ivy.minimum.javaversion}"
debug="${debug.mode}"
--- apache-ivy-2.5.2/src/java/org/apache/ivy/util/FileUtil.java 2023-10-30
16:09:23.928969555 +0100
+++ apache-ivy-2.5.2/src/java/org/apache/ivy/util/FileUtil.java 2023-10-30
16:13:35.547375897 +0100
@@ -46,7 +46,7 @@
import java.util.zip.GZIPInputStream;
import java.util.zip.ZipInputStream;
-import static java.util.jar.Pack200.newUnpacker;
+import static io.pack200.Pack200.newUnpacker;
/**
* Utility class used to deal with file related operations, like copy, full
reading, symlink, ...
