commit javapackages-tools for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package javapackages-tools for
openSUSE:Factory checked in at 2024-07-19 15:26:00
Comparing /work/SRC/openSUSE:Factory/javapackages-tools (Old)
and /work/SRC/openSUSE:Factory/.javapackages-tools.new.17339 (New)
Package is "javapackages-tools"
Fri Jul 19 15:26:00 2024 rev:41 rq:1188405 version:6.2.0
Changes:
--- /work/SRC/openSUSE:Factory/javapackages-tools/javapackages-tools.changes
2023-10-05 20:03:02.850484100 +0200
+++
/work/SRC/openSUSE:Factory/.javapackages-tools.new.17339/javapackages-tools.changes
2024-07-19 15:26:16.932668582 +0200
@@ -1,0 +2,8 @@
+Thu Jul 18 12:15:00 UTC 2024 - Fridrich Strba
+
+- Added patch:
+ * 0008-Reproducible-builds-constant-timestamp-for-pom.prope.patch
++ use reproducible timestamp when post-processing jar files and
+ adding there the pom.properties file.
+
+---
New:
0008-Reproducible-builds-constant-timestamp-for-pom.prope.patch
BETA DEBUG BEGIN:
New:- Added patch:
* 0008-Reproducible-builds-constant-timestamp-for-pom.prope.patch
+ use reproducible timestamp when post-processing jar files and
BETA DEBUG END:
Other differences:
--
++ javapackages-tools.spec ++
--- /var/tmp/diff_new_pack.9z9vL7/_old 2024-07-19 15:26:17.488690706 +0200
+++ /var/tmp/diff_new_pack.9z9vL7/_new 2024-07-19 15:26:17.488690706 +0200
@@ -1,7 +1,7 @@
#
-# spec file
+# spec file for package javapackages-tools
#
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -59,6 +59,8 @@
Patch8: 0006-Test-variable-expansion-in-artifactId.patch
#PATCH-FIX-UPSTREAM: test gracious handling of construct
Patch9: 0007-Test-that-we-don-t-bomb-on-relativePath.patch
+#PATCH-FIX-UPSTREAM: make the pom.properties have reproducible timestamp
+Patch10:0008-Reproducible-builds-constant-timestamp-for-pom.prope.patch
BuildRequires: asciidoc
BuildRequires: fdupes
BuildRequires: perl
++ 0008-Reproducible-builds-constant-timestamp-for-pom.prope.patch ++
>From 2ffdd71d859af3254732e30013bfddb2497c8a41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fridrich=20=C5=A0trba?=
Date: Tue, 16 Jul 2024 06:56:39 +0200
Subject: [PATCH 8/8] Reproducible builds: constant timestamp for
pom.properties
---
java-utils/maven_depmap.py | 8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/java-utils/maven_depmap.py b/java-utils/maven_depmap.py
index 4bfb877d..693cf5e3 100644
--- a/java-utils/maven_depmap.py
+++ b/java-utils/maven_depmap.py
@@ -43,7 +43,7 @@ import sys
from os.path import basename, dirname
import zipfile
-from time import gmtime, strftime
+import time
from copy import deepcopy
from javapackages.maven.pom import POM
@@ -172,7 +172,11 @@ def append_if_missing(archive_name, file_name,
file_contents):
archive = zipfile.ZipFile(archive_name, 'a')
try:
if file_name not in archive.namelist():
-archive.writestr(file_name, file_contents)
+file_time = min(4354819199,
+max(315532800,
+int(os.environ.get('SOURCE_DATE_EPOCH', time.time()
+file_zipinfo = zipfile.ZipInfo(file_name,
date_time=time.gmtime(file_time))
+archive.writestr(file_zipinfo, file_contents)
finally:
archive.close()
--
2.45.2
commit javapackages-tools for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package javapackages-tools for
openSUSE:Factory checked in at 2023-10-05 20:02:50
Comparing /work/SRC/openSUSE:Factory/javapackages-tools (Old)
and /work/SRC/openSUSE:Factory/.javapackages-tools.new.28202 (New)
Package is "javapackages-tools"
Thu Oct 5 20:02:50 2023 rev:40 rq:1115402 version:6.2.0
Changes:
--- /work/SRC/openSUSE:Factory/javapackages-tools/javapackages-tools.changes
2023-09-13 20:44:24.553750326 +0200
+++
/work/SRC/openSUSE:Factory/.javapackages-tools.new.28202/javapackages-tools.changes
2023-10-05 20:03:02.850484100 +0200
@@ -1,0 +2,13 @@
+Wed Oct 4 07:18:58 UTC 2023 - Fridrich Strba
+
+- Added patches:
+ * 0005-Interpolate-properties-also-in-the-current-artifact.patch
++ interpolate variables also in current artifactId, groupId and
+ version
+ * 0006-Test-variable-expansion-in-artifactId.patch
++ test previous changes
+ * 0007-Test-that-we-don-t-bomb-on-relativePath.patch
++ test gracious handling of empty in parent
+ reference of a pom file
+
+---
New:
0005-Interpolate-properties-also-in-the-current-artifact.patch
0006-Test-variable-expansion-in-artifactId.patch
0007-Test-that-we-don-t-bomb-on-relativePath.patch
Other differences:
--
++ javapackages-tools.spec ++
--- /var/tmp/diff_new_pack.6cl1nJ/_old 2023-10-05 20:03:04.530544795 +0200
+++ /var/tmp/diff_new_pack.6cl1nJ/_new 2023-10-05 20:03:04.534544940 +0200
@@ -53,6 +53,12 @@
Patch5: 0003-Reproducible-exclusions-order-in-maven-metadata.patch
#PATCH-FIX-UPSTREAM: make the aliases and dependencies lists so that the order
is kept
Patch6: 0004-Reproducible-builds-keep-order-of-aliases-and-depend.patch
+#PATCH-FIX-UPSTREAM: substitute variables like _${scala.binary.version} in
artifact coordinates
+Patch7: 0005-Interpolate-properties-also-in-the-current-artifact.patch
+#PATCH-FIX-UPSTREAM: test changes from previous patch
+Patch8: 0006-Test-variable-expansion-in-artifactId.patch
+#PATCH-FIX-UPSTREAM: test gracious handling of construct
+Patch9: 0007-Test-that-we-don-t-bomb-on-relativePath.patch
BuildRequires: asciidoc
BuildRequires: fdupes
BuildRequires: perl
++ 0005-Interpolate-properties-also-in-the-current-artifact.patch ++
>From d458bce49270bccfa40e9c4e288b3c9550aff741 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fridrich=20=C5=A0trba?=
Date: Wed, 4 Oct 2023 04:07:58 +0200
Subject: [PATCH 5/5] Interpolate properties also in the current artifact
---
java-utils/install_pom.py | 15 +--
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/java-utils/install_pom.py b/java-utils/install_pom.py
index e0282773..5f9fd741 100644
--- a/java-utils/install_pom.py
+++ b/java-utils/install_pom.py
@@ -31,6 +31,7 @@
# Authors: Michal Srb
from javapackages.maven.pom import POM, PomLoadingException
+from javapackages.maven.artifact import Artifact
from javapackages.xmvn.xmvn_resolve import (XMvnResolve, ResolutionRequest,
XMvnResolveException)
@@ -164,7 +165,7 @@ def gather_dependencies(pom_path):
# only deps with scope "compile" or "runtime" are interesting
deps = [x for x in deps if x.scope in ["", "compile", "runtime"]]
-return deps
+return deps, props
def _get_dependencies(pom):
@@ -215,21 +216,23 @@ def _main():
if uart.packaging and uart.packaging.lower() == 'pom':
tree = ElementTree.parse(args[0])
else:
+mvn_deps, props = gather_dependencies(pom_path)
+mvn_art = Artifact.from_mvn_str(str(uart))
+mvn_art.interpolate(props)
result_pom = "\n"
result_pom += "http://maven.apache.org/POM/4.0.0\;>\n"
result_pom += " 4.0.0\n"
-result_pom += (" {0}\n" ).format(uart.groupId)
-result_pom += (" {0}\n"
).format(uart.artifactId)
-result_pom += (" {0}\n").format(uart.version)
+result_pom += (" {0}\n" ).format(mvn_art.groupId)
+result_pom += (" {0}\n"
).format(mvn_art.artifactId)
+result_pom += (" {0}\n").format(mvn_art.version)
if hasattr(uart, "packaging") and uart.packaging != 'jar':
result_pom += ("
{0}\n").format(uart.packaging)
if hasattr(uart, "extension") and uart.extension != 'jar':
result_pom += ("
{0}\n").format(uart.extension)
-if hasattr(uart, "classifier") and uart.classifiler != '':
+if hasattr(uart, "classifier") and uart.classifier != '':
result_pom += ("
{0}\n").format(uart.classifier)
-mvn_deps =
commit javapackages-tools for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package javapackages-tools for
openSUSE:Factory checked in at 2023-09-13 20:43:48
Comparing /work/SRC/openSUSE:Factory/javapackages-tools (Old)
and /work/SRC/openSUSE:Factory/.javapackages-tools.new.1766 (New)
Package is "javapackages-tools"
Wed Sep 13 20:43:48 2023 rev:39 rq:1110919 version:6.2.0
Changes:
--- /work/SRC/openSUSE:Factory/javapackages-tools/javapackages-tools.changes
2023-09-10 13:09:32.037061805 +0200
+++
/work/SRC/openSUSE:Factory/.javapackages-tools.new.1766/javapackages-tools.changes
2023-09-13 20:44:24.553750326 +0200
@@ -1,0 +2,15 @@
+Wed Sep 13 13:52:00 UTC 2023 - Fridrich Strba
+
+- Added patch:
+ * 0004-Reproducible-builds-keep-order-of-aliases-and-depend.patch
++ make the aliases and dependencies lists so that the order is
+ kept
+
+---
+Tue Sep 12 09:54:08 UTC 2023 - Fridrich Strba
+
+- Added patch:
+ * 0003-Reproducible-exclusions-order-in-maven-metadata.patch
++ sort exclusions in maven metadata
+
+---
New:
0003-Reproducible-exclusions-order-in-maven-metadata.patch
0004-Reproducible-builds-keep-order-of-aliases-and-depend.patch
Other differences:
--
++ javapackages-tools.spec ++
--- /var/tmp/diff_new_pack.DUbZR2/_old 2023-09-13 20:44:26.125806216 +0200
+++ /var/tmp/diff_new_pack.DUbZR2/_new 2023-09-13 20:44:26.129806357 +0200
@@ -49,6 +49,10 @@
Patch3: 0001-Make-maven_depmap-order-of-aliases-reproducible.patch
#PATCH-FIX-UPSTREAM: Do not bomb on construct
Patch4: 0002-Do-not-bomb-on-relativePath-construct.patch
+#PATCH-FIX-UPSTREAM: Sort exclusions when writing out metadata
+Patch5: 0003-Reproducible-exclusions-order-in-maven-metadata.patch
+#PATCH-FIX-UPSTREAM: make the aliases and dependencies lists so that the order
is kept
+Patch6: 0004-Reproducible-builds-keep-order-of-aliases-and-depend.patch
BuildRequires: asciidoc
BuildRequires: fdupes
BuildRequires: perl
++ 0003-Reproducible-exclusions-order-in-maven-metadata.patch ++
>From 66ba33a8c28497e01eddcb0cd17fbe324674eabc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fridrich=20=C5=A0trba?=
Date: Mon, 11 Sep 2023 18:43:28 +0200
Subject: [PATCH 3/3] Reproducible exclusions order in maven metadata
---
python/javapackages/metadata/dependency.py | 4 ++--
python/javapackages/metadata/exclusion.py | 9 +
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/python/javapackages/metadata/dependency.py
b/python/javapackages/metadata/dependency.py
index 1709e1fb..5931134d 100644
--- a/python/javapackages/metadata/dependency.py
+++ b/python/javapackages/metadata/dependency.py
@@ -46,7 +46,7 @@ class MetadataDependency(ObjectBinding):
defaults = {'extension': 'jar',
'requestedVersion': 'SYSTEM'}
types = {'optional': str, # todo bool
- 'exclusions': set([MetadataExclusion])}
+ 'exclusions': list([MetadataExclusion])}
def is_optional(self):
if self.optional and self.optional.lower() == "true":
@@ -145,4 +145,4 @@ class MetadataDependency(ObjectBinding):
classifier=mvn_dep.classifier,
optional=mvn_dep.optional,
requestedVersion=mvn_dep.version,
- exclusions=exclusions)
+ exclusions=sorted(exclusions))
diff --git a/python/javapackages/metadata/exclusion.py
b/python/javapackages/metadata/exclusion.py
index 3152b090..5b9503c0 100644
--- a/python/javapackages/metadata/exclusion.py
+++ b/python/javapackages/metadata/exclusion.py
@@ -41,6 +41,15 @@ class MetadataExclusion(ObjectBinding):
element_name = 'exclusion'
fields = ['groupId', 'artifactId']
+def __lt__(self, other):
+if self.groupId < other.groupId:
+return True
+if self.groupId > other.groupId:
+return False
+if self.artifactId < other.artifactId:
+return True
+return False
+
def get_mvn_str(self):
return Printer.get_mvn_str(self.groupId, self.artifactId)
--
2.42.0
++ 0004-Reproducible-builds-keep-order-of-aliases-and-depend.patch ++
>From f211da6e4cf216a020b47ccab9b2c7806c5a8a62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fridrich=20=C5=A0trba?=
Date: Wed, 13 Sep 2023 15:47:54 +0200
Subject: [PATCH 4/4] Reproducible builds: keep order of aliases and
dependencies
---
python/javapackages/metadata/artifact.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/python/javapackages/metadata/artifact.py
commit javapackages-tools for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package javapackages-tools for
openSUSE:Factory checked in at 2023-09-10 13:09:22
Comparing /work/SRC/openSUSE:Factory/javapackages-tools (Old)
and /work/SRC/openSUSE:Factory/.javapackages-tools.new.1766 (New)
Package is "javapackages-tools"
Sun Sep 10 13:09:22 2023 rev:38 rq:1109307 version:6.2.0
Changes:
--- /work/SRC/openSUSE:Factory/javapackages-tools/javapackages-tools.changes
2023-09-06 18:55:51.778574475 +0200
+++
/work/SRC/openSUSE:Factory/.javapackages-tools.new.1766/javapackages-tools.changes
2023-09-10 13:09:32.037061805 +0200
@@ -1,0 +2,12 @@
+Tue Sep 5 11:40:09 UTC 2023 - Fridrich Strba
+
+- Modified patch:
+ * 0001-Make-the-alias-generation-reproducible.patch ->
+0001-Make-maven_depmap-order-of-aliases-reproducible.patch
++ replace by the version of patch integrated by upstream
+- Added patch:
+ * 0002-Do-not-bomb-on-relativePath-construct.patch
++ integrated patch fixing parent recursion with empty
+ element
+
+---
Old:
0001-Make-the-alias-generation-reproducible.patch
New:
0001-Make-maven_depmap-order-of-aliases-reproducible.patch
0002-Do-not-bomb-on-relativePath-construct.patch
Other differences:
--
++ javapackages-tools.spec ++
--- /var/tmp/diff_new_pack.8TeHtd/_old 2023-09-10 13:09:33.397110396 +0200
+++ /var/tmp/diff_new_pack.8TeHtd/_new 2023-09-10 13:09:33.401110539 +0200
@@ -45,8 +45,10 @@
#PATCH-FIX-SUSE: SUSE did not bump epoch of openjdk packages, whereas Fedora
did
# Avoid generating unresolvable requires
Patch2: suse-no-epoch.patch
-#PATCH-FIX-SUSE: Let maven_depmap.py generate reproducible list of aliases
-Patch3: 0001-Make-the-alias-generation-reproducible.patch
+#PATCH-FIX-UPSTREAM: Make maven_depmap order of aliases reproducible
+Patch3: 0001-Make-maven_depmap-order-of-aliases-reproducible.patch
+#PATCH-FIX-UPSTREAM: Do not bomb on construct
+Patch4: 0002-Do-not-bomb-on-relativePath-construct.patch
BuildRequires: asciidoc
BuildRequires: fdupes
BuildRequires: perl
++ 0001-Make-maven_depmap-order-of-aliases-reproducible.patch ++
>From 5cc434bdeffbee25158ae2bdcda08f4b07610f7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fridrich=20=C5=A0trba?=
Date: Mon, 4 Sep 2023 16:14:43 +0200
Subject: [PATCH 1/2] Make maven_depmap order of aliases reproducible
---
java-utils/maven_depmap.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java-utils/maven_depmap.py b/java-utils/maven_depmap.py
index 6a0520fa..4bfb877d 100644
--- a/java-utils/maven_depmap.py
+++ b/java-utils/maven_depmap.py
@@ -213,7 +213,7 @@ def add_aliases(artifact, additions):
aliases = additions.split(',')
result = list()
-for a in aliases:
+for a in sorted(aliases):
alias = MetadataAlias.from_mvn_str(a)
alias.extension = artifact.extension
result.append(alias)
--
2.42.0
++ 0002-Do-not-bomb-on-relativePath-construct.patch ++
>From d124f4d16883d74cdf8ab9064667e128a3695230 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fridrich=20=C5=A0trba?=
Date: Mon, 4 Sep 2023 22:44:10 +0200
Subject: [PATCH 2/2] Do not bomb on construct
---
java-utils/mvn_artifact.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java-utils/mvn_artifact.py b/java-utils/mvn_artifact.py
index a45946cd..b7520528 100644
--- a/java-utils/mvn_artifact.py
+++ b/java-utils/mvn_artifact.py
@@ -167,7 +167,7 @@ def gather_dependencies(pom_path):
parent = pom.parent
while parent:
ppom = None
-if parent.relativePath:
+if hasattr(parent, 'relativePath') and parent.relativePath:
try:
ppom_path = os.path.join(os.path.dirname(curr_pom._path),
parent.relativePath)
--
2.42.0
commit javapackages-tools for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package javapackages-tools for
openSUSE:Factory checked in at 2023-09-06 18:55:31
Comparing /work/SRC/openSUSE:Factory/javapackages-tools (Old)
and /work/SRC/openSUSE:Factory/.javapackages-tools.new.1766 (New)
Package is "javapackages-tools"
Wed Sep 6 18:55:31 2023 rev:37 rq:1108778 version:6.2.0
Changes:
--- /work/SRC/openSUSE:Factory/javapackages-tools/javapackages-tools.changes
2023-08-22 08:55:04.082435866 +0200
+++
/work/SRC/openSUSE:Factory/.javapackages-tools.new.1766/javapackages-tools.changes
2023-09-06 18:55:51.778574475 +0200
@@ -1,0 +2,13 @@
+Sat Sep 2 23:07:32 UTC 2023 - Fridrich Strba
+
+- Upgrade to upstream version 6.2.0
+ * Ãntegrate our changes from javapackages-6.1.0-maven-depmap.patch
+- Removed patch:
+ * javapackages-6.1.0-maven-depmap.patch
++ upstreamed
+- Added patch:
+ * 0001-Make-the-alias-generation-reproducible.patch
++ separate patch for our reproducible changes that was not
+ part of the integrated pull request
+
+---
Old:
6.1.0.tar.gz
javapackages-6.1.0-maven-depmap.patch
New:
0001-Make-the-alias-generation-reproducible.patch
6.2.0.tar.gz
Other differences:
--
++ javapackages-tools.spec ++
--- /var/tmp/diff_new_pack.4XZ4yC/_old 2023-09-06 18:55:53.158623671 +0200
+++ /var/tmp/diff_new_pack.4XZ4yC/_new 2023-09-06 18:55:53.162623813 +0200
@@ -30,7 +30,7 @@
%else
Name: javapackages-tools
%endif
-Version:6.1.0
+Version:6.2.0
Release:0
Summary:Macros and scripts for Java packaging support
License:BSD-3-Clause
@@ -45,8 +45,8 @@
#PATCH-FIX-SUSE: SUSE did not bump epoch of openjdk packages, whereas Fedora
did
# Avoid generating unresolvable requires
Patch2: suse-no-epoch.patch
-#PATCH-FIX-SUSE: Let maven_depmap.py generate metadata with dependencies under
certain circumstances
-Patch3: javapackages-%{version}-maven-depmap.patch
+#PATCH-FIX-SUSE: Let maven_depmap.py generate reproducible list of aliases
+Patch3: 0001-Make-the-alias-generation-reproducible.patch
BuildRequires: asciidoc
BuildRequires: fdupes
BuildRequires: perl
@@ -75,9 +75,6 @@
%define python_sitelib %python3_sitelib
%define python_files() -n python3-%{**}
%endif
-%else
-Provides: mvn(com.sun:tools) = SYSTEM
-Provides: mvn(sun.jdk:jconsole) = SYSTEM
%endif
%description
@@ -236,7 +233,7 @@
%else
-%files -n javapackages-local -f files-common -f files-extra -f files-compat -f
files-generators
+%files -n javapackages-local -f files-common -f files-compat -f
files-generators
%dir %{_datadir}/java-utils
%files -n javapackages-ivy -f files-ivy
++ 0001-Make-the-alias-generation-reproducible.patch ++
>From 88ca6f13c707652c9992e9f7f4b86c5bdc198d03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fridrich=20=C5=A0trba?=
Date: Sun, 3 Sep 2023 01:03:26 +0200
Subject: [PATCH] Make the alias generation reproducible
---
java-utils/maven_depmap.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java-utils/maven_depmap.py b/java-utils/maven_depmap.py
index 6a0520fa..4bfb877d 100644
--- a/java-utils/maven_depmap.py
+++ b/java-utils/maven_depmap.py
@@ -213,7 +213,7 @@ def add_aliases(artifact, additions):
aliases = additions.split(',')
result = list()
-for a in aliases:
+for a in sorted(aliases):
alias = MetadataAlias.from_mvn_str(a)
alias.extension = artifact.extension
result.append(alias)
--
2.41.0
++ 6.1.0.tar.gz -> 6.2.0.tar.gz ++
5542 lines of diff (skipped)
commit javapackages-tools for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package javapackages-tools for
openSUSE:Factory checked in at 2023-08-22 08:55:01
Comparing /work/SRC/openSUSE:Factory/javapackages-tools (Old)
and /work/SRC/openSUSE:Factory/.javapackages-tools.new.1766 (New)
Package is "javapackages-tools"
Tue Aug 22 08:55:01 2023 rev:36 rq:1105109 version:6.1.0
Changes:
--- /work/SRC/openSUSE:Factory/javapackages-tools/javapackages-tools.changes
2023-06-01 17:18:49.413912541 +0200
+++
/work/SRC/openSUSE:Factory/.javapackages-tools.new.1766/javapackages-tools.changes
2023-08-22 08:55:04.082435866 +0200
@@ -1,0 +2,7 @@
+Mon Aug 21 14:49:36 UTC 2023 - Fridrich Strba
+
+- Modified patch:
+ * javapackages-6.1.0-maven-depmap.patch
++ try to make the list of aliases more reproducible
+
+---
Other differences:
--
++ javapackages-6.1.0-maven-depmap.patch ++
--- /var/tmp/diff_new_pack.q117RD/_old 2023-08-22 08:55:04.886437394 +0200
+++ /var/tmp/diff_new_pack.q117RD/_new 2023-08-22 08:55:04.894437409 +0200
@@ -515,7 +515,7 @@
+
+aliases = additions.split(',')
+result = list()
-+for a in aliases:
++for a in sorted(aliases):
+alias = MetadataAlias.from_mvn_str(a)
+alias.extension = artifact.extension
+result.append(alias)
commit javapackages-tools for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package javapackages-tools for
openSUSE:Factory checked in at 2023-06-01 17:18:46
Comparing /work/SRC/openSUSE:Factory/javapackages-tools (Old)
and /work/SRC/openSUSE:Factory/.javapackages-tools.new.2531 (New)
Package is "javapackages-tools"
Thu Jun 1 17:18:46 2023 rev:35 rq:1089671 version:6.1.0
Changes:
--- /work/SRC/openSUSE:Factory/javapackages-tools/javapackages-tools.changes
2022-11-10 14:19:26.557390715 +0100
+++
/work/SRC/openSUSE:Factory/.javapackages-tools.new.2531/javapackages-tools.changes
2023-06-01 17:18:49.413912541 +0200
@@ -1,0 +2,7 @@
+Sun May 28 19:15:09 UTC 2023 - Fridrich Strba
+
+- Enable the tests also for older distributions
+- Require python3-xml (python-xml for distributions that use
+ versioned modules), since module xml needed by some scripts.
+
+---
Other differences:
--
++ javapackages-tools.spec ++
--- /var/tmp/diff_new_pack.7VaBg6/_old 2023-06-01 17:18:49.905915457 +0200
+++ /var/tmp/diff_new_pack.7VaBg6/_new 2023-06-01 17:18:49.913915505 +0200
@@ -1,7 +1,7 @@
#
# spec file
#
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -63,9 +63,7 @@
Obsoletes: jpackage-utils < %{version}
%if %{with python}
BuildRequires: %{python_module lxml}
-%if 0%{?suse_version} > 1320
BuildRequires: %{python_module pytest}
-%endif
BuildRequires: %{python_module setuptools}
BuildRequires: python-rpm-macros
BuildArch: noarch
@@ -109,6 +107,7 @@
Summary:Module for handling various files for Java packaging
Group: Development/Languages/Java
Requires: python-lxml
+Requires: python-xml
%description -n python-javapackages
Module for handling, querying and manipulating of various files for Java
@@ -120,6 +119,7 @@
Summary:Module for handling various files for Java packaging
Group: Development/Languages/Java
Requires: python3-lxml
+Requires: python3-xml
Obsoletes: python-javapackages < %{version}-%{release}
Provides: python-javapackages = %{version}-%{release}
@@ -210,7 +210,6 @@
%fdupes %{buildroot}/%{_prefix}
-%if 0%{?suse_version} > 1320
%check
# reference: ./check, but we don't want to check coverage and don't need old
nose
(
@@ -228,7 +227,6 @@
%pytest
popd
%endif
-%endif
%if !%{with python}
%files -f files-tools
commit javapackages-tools for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package javapackages-tools for
openSUSE:Factory checked in at 2022-11-10 14:19:24
Comparing /work/SRC/openSUSE:Factory/javapackages-tools (Old)
and /work/SRC/openSUSE:Factory/.javapackages-tools.new.1597 (New)
Package is "javapackages-tools"
Thu Nov 10 14:19:24 2022 rev:34 rq:1034837 version:6.1.0
Changes:
--- /work/SRC/openSUSE:Factory/javapackages-tools/javapackages-tools.changes
2022-07-09 16:59:49.836507623 +0200
+++
/work/SRC/openSUSE:Factory/.javapackages-tools.new.1597/javapackages-tools.changes
2022-11-10 14:19:26.557390715 +0100
@@ -1,0 +2,5 @@
+Wed Nov 9 08:50:08 UTC 2022 - Fridrich Strba
+
+- Reflect the removal of gradle from repositories
+
+---
Other differences:
--
++ javapackages-tools.spec ++
--- /var/tmp/diff_new_pack.afgQnL/_old 2022-11-10 14:19:27.053393449 +0100
+++ /var/tmp/diff_new_pack.afgQnL/_new 2022-11-10 14:19:27.061393492 +0100
@@ -94,16 +94,6 @@
install their content.
%if %{with python}
-%package -n javapackages-gradle
-Summary:Local mode for Gradle (files)
-Group: Development/Languages/Java
-Requires: javapackages-local = %{version}
-Requires: javapackages-tools = %{version}
-
-%description -n javapackages-gradle
-This package contains files needed by local mode for Gradle, which
-allows artifact resolution using XMvn resolver.
-
%package -n javapackages-ivy
Summary:Local mode for Apache Ivy (files)
Group: Development/Languages/Java
@@ -207,6 +197,9 @@
%{_mandir}/man1/find-jar.1
%{_datadir}/maven-metadata/javapackages-metadata.xml
%{_datadir}/xmvn/configuration.xml
+%{_bindir}/gradle-local
+%{_datadir}/gradle-local
+%{_mandir}/man7/gradle_build.7
"
for i in $files; do
rm -rf %{buildroot}/$i
@@ -248,9 +241,6 @@
%files -n javapackages-local -f files-common -f files-extra -f files-compat -f
files-generators
%dir %{_datadir}/java-utils
-%files -n javapackages-gradle -f files-gradle
-%dir %{_datadir}/gradle-local
-
%files -n javapackages-ivy -f files-ivy
%dir %{_sysconfdir}/ant.d
commit javapackages-tools for openSUSE:Factory
Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package javapackages-tools for openSUSE:Factory checked in at 2022-07-09 16:59:35 Comparing /work/SRC/openSUSE:Factory/javapackages-tools (Old) and /work/SRC/openSUSE:Factory/.javapackages-tools.new.1523 (New) Package is "javapackages-tools" Sat Jul 9 16:59:35 2022 rev:33 rq:987480 version:6.1.0 Changes: --- /work/SRC/openSUSE:Factory/javapackages-tools/javapackages-tools.changes 2022-06-07 11:44:55.731213931 +0200 +++ /work/SRC/openSUSE:Factory/.javapackages-tools.new.1523/javapackages-tools.changes 2022-07-09 16:59:49.836507623 +0200 @@ -1,0 +2,67 @@ +Thu Jul 7 06:50:09 UTC 2022 - Fridrich Strba + +- Update to upstream version 6.1.0 + * Release version 6.1.0 + * Introduce common and extra subpackages + * Update documentation + * Add lua interpreter to check and GH actions + * Remove license headers from wrapper scripts + * Make scripts compatible with rpmlua + * Add more tests, fix behaviour + * Implement separate simple class name matching + * Minor changes + * Modularize Lua scripts + * Add Lua scripts for removing annotations + * Update build status badge in README.md + * Migrate CI from TravisCI to GitHub Actions + * Fix running tests without coverage + * Update ivy-local-classpath + * Release version 6.0.0 + * Fix extra XML handling of pom_change_dep + * Add reproducer for #82 + * Respect %jpb_env RPM macro + * Add bootstrap metadata to XMvn resolver config + * Delete run_tests.py + * Replace nose by pytest + * [install] Make glob pattern work with Python 3.10 + * Adding ppc64le architecture support on travis-ci + * Drop deprecated add_maven_depmap macro + * Drop SCL support + * Fix provides matching + * Fix builddep snippet generation + * [test] Add test for builddep snippet generation + * Add location of java binary used by the java-1.8.0-openjdk +(JRE) package so that setting JAVA_HOME will work correctly + * Use XMvn Javadoc MOJO by default + * Remove explicit import of Python 3 features + * Remove dependency on Six compatibility library + * Fix invalid in XMvn configuration + * [test] Don't try to kill PID 1 during tests + * [travis] Drop Python 2 from test matrix + * Add separate subpackage with RPM generators + * mvn_build: replace inline shell scriptlet with native python +code + * [test] Don't use networking during tests + * Add apache-rat-plugin to skippedPlugins + * Skip execution of various Maven plugins + * Remove Python 3.5 from .travis.yml + * Make generated javadoc package noarch +- Added patch: + * javapackages-6.1.0-maven-depmap.patch ++ Bulk patch correspoding to our pull request + https://github.com/fedora-java/javapackages/pull/92 which + brings back some of the removed tools that we depend on + heavily +- Modified patches: + * python-optional.patch + * suse-use-libdir.patch ++ Rediff to changed context +- Removed patches: + * 0001-Let-maven_depmap.py-generate-metadata-with-dependenc.patch + * 0002-Do-not-try-to-construct-POM-from-maven-coordinate-st.patch + * 0003-Fix-tests-after-the-recent-maven_depmap.py-changes.patch ++ Already part of the above-mentioned bulk patch + * 0004-Remove-dependency-on-Six-compatibility-library.patch ++ Upstream patch already integrated in the 6.x code-line + +--- Old: 0001-Let-maven_depmap.py-generate-metadata-with-dependenc.patch 0002-Do-not-try-to-construct-POM-from-maven-coordinate-st.patch 0003-Fix-tests-after-the-recent-maven_depmap.py-changes.patch 0004-Remove-dependency-on-Six-compatibility-library.patch 5.3.1.tar.gz New: 6.1.0.tar.gz javapackages-6.1.0-maven-depmap.patch Other differences: -- ++ javapackages-tools.spec ++ --- /var/tmp/diff_new_pack.ZfzNg2/_old 2022-07-09 16:59:50.636508825 +0200 +++ /var/tmp/diff_new_pack.ZfzNg2/_new 2022-07-09 16:59:50.640508831 +0200 @@ -30,7 +30,7 @@ %else Name: javapackages-tools %endif -Version:5.3.1 +Version:6.1.0 Release:0 Summary:Macros and scripts for Java packaging support License:BSD-3-Clause @@ -46,10 +46,7 @@ # Avoid generating unresolvable requires Patch2: suse-no-epoch.patch #PATCH-FIX-SUSE: Let maven_depmap.py generate metadata with dependencies under certain circumstances -Patch3: 0001-Let-maven_depmap.py-generate-metadata-with-dependenc.patch -Patch4: 0002-Do-not-try-to-construct-POM-from-maven-coordinate-st.patch -Patch5: 0003-Fix-tests-after-the-recent-maven_depmap.py-changes.patch -Patch6:
commit javapackages-tools for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package javapackages-tools for
openSUSE:Factory checked in at 2022-06-07 11:44:52
Comparing /work/SRC/openSUSE:Factory/javapackages-tools (Old)
and /work/SRC/openSUSE:Factory/.javapackages-tools.new.1548 (New)
Package is "javapackages-tools"
Tue Jun 7 11:44:52 2022 rev:32 rq:980932 version:5.3.1
Changes:
--- /work/SRC/openSUSE:Factory/javapackages-tools/javapackages-tools.changes
2022-06-04 23:26:51.820745370 +0200
+++
/work/SRC/openSUSE:Factory/.javapackages-tools.new.1548/javapackages-tools.changes
2022-06-07 11:44:55.731213931 +0200
@@ -1,0 +2,5 @@
+Sun Jun 5 20:04:33 UTC 2022 - Fridrich Strba
+
+- Fix wrong conditioning of the python-six require.
+
+---
Other differences:
--
++ javapackages-tools.spec ++
--- /var/tmp/diff_new_pack.xDpF5N/_old 2022-06-07 11:44:56.935215573 +0200
+++ /var/tmp/diff_new_pack.xDpF5N/_new 2022-06-07 11:44:56.939215578 +0200
@@ -68,9 +68,10 @@
BuildRequires: %{python_module lxml}
%if 0%{?suse_version} > 1320
BuildRequires: %{python_module pytest}
+%else
+BuildRequires: %{python_module six}
%endif
BuildRequires: %{python_module setuptools}
-BuildRequires: %{python_module six}
BuildRequires: python-rpm-macros
BuildArch: noarch
%if 0%{?suse_version} >= 1550
@@ -123,7 +124,7 @@
Summary:Module for handling various files for Java packaging
Group: Development/Languages/Java
Requires: python-lxml
-%if 0%{?suse_version} > 1320
+%if 0%{?suse_version} <= 1320
Requires: python-six
%endif
@@ -139,7 +140,7 @@
Requires: python3-lxml
Obsoletes: python-javapackages < %{version}-%{release}
Provides: python-javapackages = %{version}-%{release}
-%if 0%{?suse_version} > 1320
+%if 0%{?suse_version} <= 1320
Requires: python3-six
%endif
@@ -167,7 +168,7 @@
%patch3 -p1
%patch4 -p1
%patch5 -p1
-%if 0%{?suse_version} >= 1320
+%if 0%{?suse_version} > 1320
%patch6 -p1
%endif
commit javapackages-tools for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package javapackages-tools for
openSUSE:Factory checked in at 2022-06-04 23:26:49
Comparing /work/SRC/openSUSE:Factory/javapackages-tools (Old)
and /work/SRC/openSUSE:Factory/.javapackages-tools.new.1548 (New)
Package is "javapackages-tools"
Sat Jun 4 23:26:49 2022 rev:31 rq:980646 version:5.3.1
Changes:
--- /work/SRC/openSUSE:Factory/javapackages-tools/javapackages-tools.changes
2022-05-12 22:57:33.268570765 +0200
+++
/work/SRC/openSUSE:Factory/.javapackages-tools.new.1548/javapackages-tools.changes
2022-06-04 23:26:51.820745370 +0200
@@ -1,0 +2,7 @@
+Fri Jun 3 10:11:21 UTC 2022 - Fridrich Strba
+
+- Added patch:
+ * 0004-Remove-dependency-on-Six-compatibility-library.patch
++ remove dependency on python-six for newer distributions
+
+---
New:
0004-Remove-dependency-on-Six-compatibility-library.patch
Other differences:
--
++ javapackages-tools.spec ++
--- /var/tmp/diff_new_pack.dU2J7o/_old 2022-06-04 23:26:52.336745892 +0200
+++ /var/tmp/diff_new_pack.dU2J7o/_new 2022-06-04 23:26:52.344745901 +0200
@@ -49,6 +49,7 @@
Patch3: 0001-Let-maven_depmap.py-generate-metadata-with-dependenc.patch
Patch4: 0002-Do-not-try-to-construct-POM-from-maven-coordinate-st.patch
Patch5: 0003-Fix-tests-after-the-recent-maven_depmap.py-changes.patch
+Patch6: 0004-Remove-dependency-on-Six-compatibility-library.patch
BuildRequires: asciidoc
BuildRequires: fdupes
BuildRequires: perl
@@ -122,7 +123,9 @@
Summary:Module for handling various files for Java packaging
Group: Development/Languages/Java
Requires: python-lxml
+%if 0%{?suse_version} > 1320
Requires: python-six
+%endif
%description -n python-javapackages
Module for handling, querying and manipulating of various files for Java
@@ -134,9 +137,11 @@
Summary:Module for handling various files for Java packaging
Group: Development/Languages/Java
Requires: python3-lxml
-Requires: python3-six
Obsoletes: python-javapackages < %{version}-%{release}
Provides: python-javapackages = %{version}-%{release}
+%if 0%{?suse_version} > 1320
+Requires: python3-six
+%endif
%description -n python3-javapackages
Module for handling, querying and manipulating of various files for Java
@@ -156,7 +161,15 @@
%prep
%setup -q -n javapackages-%{version}
-%autopatch -p1
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%if 0%{?suse_version} >= 1320
+%patch6 -p1
+%endif
# The usr/lib is hardcoded in configuration files too
new_dir=$(echo %{_libdir} | sed 's#/##')
++ 0004-Remove-dependency-on-Six-compatibility-library.patch ++
>From 06018a8e30d8b781b7b2937fa7c579a5c0758d57 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski
Date: Thu, 23 Jul 2020 10:22:52 +0200
Subject: [PATCH] Remove dependency on Six compatibility library
Python 2 support was dropped, so use of Six is no longer needed.
---
Vagrantfile| 1 -
java-utils/builddep.py | 2 --
java-utils/mvn_alias.py| 3 ---
java-utils/mvn_artifact.py | 3 ---
java-utils/mvn_build.py| 4 +---
java-utils/mvn_compat_version.py | 2 --
java-utils/mvn_config.py | 2 --
java-utils/mvn_file.py | 2 --
java-utils/mvn_package.py | 2 --
java-utils/pom_editor.py | 7 +++
javapackages-tools.spec| 2 --
python/javapackages/common/binding.py | 14 ++
python/javapackages/common/util.py | 8
python/javapackages/maven/artifact.py | 5 ++---
python/javapackages/metadata/artifact.py | 3 +--
python/javapackages/metadata/dependency.py | 4 +---
python/javapackages/xmvn/xmvn_config.py| 5 ++---
requirements.txt | 1 -
test/maven_depmap_test.py | 5 ++---
19 files changed, 18 insertions(+), 57 deletions(-)
diff --git a/Vagrantfile b/Vagrantfile
index 64235dc9..095d9065 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -12,7 +12,6 @@ dnf install -y \
xmlto \
python{,3} \
python{,3}-lxml \
-python{,3}-six \
python{,3}-nose \
python{,3}-coverage
SCRIPT
diff --git a/java-utils/builddep.py b/java-utils/builddep.py
index fda36d2d..695e22dc 100644
--- a/java-utils/builddep.py
+++ b/java-utils/builddep.py
@@ -35,7 +35,6 @@
from javapackages.maven.artifact import (Artifact, ArtifactFormatException,
commit javapackages-tools for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package javapackages-tools for
openSUSE:Factory checked in at 2022-05-12 22:57:29
Comparing /work/SRC/openSUSE:Factory/javapackages-tools (Old)
and /work/SRC/openSUSE:Factory/.javapackages-tools.new.1538 (New)
Package is "javapackages-tools"
Thu May 12 22:57:29 2022 rev:30 rq:975900 version:5.3.1
Changes:
--- /work/SRC/openSUSE:Factory/javapackages-tools/javapackages-tools.changes
2022-01-03 10:49:08.971574246 +0100
+++
/work/SRC/openSUSE:Factory/.javapackages-tools.new.1538/javapackages-tools.changes
2022-05-12 22:57:33.268570765 +0200
@@ -1,0 +2,10 @@
+Fri Apr 29 10:21:41 UTC 2022 - Fridrich Strba
+
+- Added patches:
+ * 0001-Let-maven_depmap.py-generate-metadata-with-dependenc.patch
+ * 0002-Do-not-try-to-construct-POM-from-maven-coordinate-st.patch
+ * 0003-Fix-tests-after-the-recent-maven_depmap.py-changes.patch
++ Let maven_depmap.py generate metadata with dependencies under
+ certain circumstances
+
+---
New:
0001-Let-maven_depmap.py-generate-metadata-with-dependenc.patch
0002-Do-not-try-to-construct-POM-from-maven-coordinate-st.patch
0003-Fix-tests-after-the-recent-maven_depmap.py-changes.patch
Other differences:
--
++ javapackages-tools.spec ++
--- /var/tmp/diff_new_pack.dw0vXA/_old 2022-05-12 22:57:33.768571436 +0200
+++ /var/tmp/diff_new_pack.dw0vXA/_new 2022-05-12 22:57:33.776571447 +0200
@@ -1,7 +1,7 @@
#
# spec file
#
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -45,6 +45,10 @@
#PATCH-FIX-SUSE: SUSE did not bump epoch of openjdk packages, whereas Fedora
did
# Avoid generating unresolvable requires
Patch2: suse-no-epoch.patch
+#PATCH-FIX-SUSE: Let maven_depmap.py generate metadata with dependencies under
certain circumstances
+Patch3: 0001-Let-maven_depmap.py-generate-metadata-with-dependenc.patch
+Patch4: 0002-Do-not-try-to-construct-POM-from-maven-coordinate-st.patch
+Patch5: 0003-Fix-tests-after-the-recent-maven_depmap.py-changes.patch
BuildRequires: asciidoc
BuildRequires: fdupes
BuildRequires: perl
++ 0001-Let-maven_depmap.py-generate-metadata-with-dependenc.patch ++
>From d2db56cd30a48bd2ece7a5112e67c80417406a36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fridrich=20=C5=A0trba?=
Date: Fri, 29 Apr 2022 12:08:21 +0200
Subject: [PATCH 1/3] Let maven_depmap.py generate metadata with dependencies
under certain circumstances
---
java-utils/maven_depmap.py | 43 +-
1 file changed, 42 insertions(+), 1 deletion(-)
diff --git a/java-utils/maven_depmap.py b/java-utils/maven_depmap.py
index 92e0ff4c..f684a728 100644
--- a/java-utils/maven_depmap.py
+++ b/java-utils/maven_depmap.py
@@ -49,6 +49,7 @@ from copy import deepcopy
from javapackages.maven.pom import POM
from javapackages.metadata.artifact import MetadataArtifact
from javapackages.metadata.alias import MetadataAlias
+from javapackages.metadata.dependency import MetadataDependency
from javapackages.metadata.metadata import Metadata
from javapackages.common.exception import JavaPackagesToolsException
@@ -132,6 +133,38 @@ def _make_files_versioned(versions, pom_path, jar_path,
pom_base, jar_base):
# return paths to versioned, but regular files (not symlinks)
return ret_pom_path, ret_jar_path
+def _resolve_deps(pom):
+deps = []
+depm = []
+props = {}
+
+deps.extend([x for x in pom.dependencies])
+depm.extend([x for x in pom.dependencyManagement])
+props = pom.properties
+if pom.groupId:
+props["project.groupId"] = pom.groupId
+if pom.artifactId:
+props["project.artifactId"] = pom.artifactId
+if pom.version:
+props["project.version"] = pom.version
+
+for d in deps:
+d.interpolate(props)
+
+for dm in depm:
+dm.interpolate(props)
+
+# apply dependencyManagement on deps
+for d in deps:
+for dm in depm:
+if d.compare_to(dm):
+d.merge_with(dm)
+break
+
+# only deps with scope "compile" or "runtime" are interesting
+deps = [x for x in deps if x.scope in ["", "compile", "runtime"]]
+
+return deps
# Add a file to a ZIP archive (or JAR, WAR, ...) unless the file
# already exists in the archive. Provided by Tomas Radej.
@@ -279,7 +312,15 @@ def _main():
if namespace:
artifact.namespace = namespace
-
commit javapackages-tools for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package javapackages-tools for
openSUSE:Factory checked in at 2022-01-03 10:49:00
Comparing /work/SRC/openSUSE:Factory/javapackages-tools (Old)
and /work/SRC/openSUSE:Factory/.javapackages-tools.new.1896 (New)
Package is "javapackages-tools"
Mon Jan 3 10:49:00 2022 rev:29 rq:943245 version:5.3.1
Changes:
--- /work/SRC/openSUSE:Factory/javapackages-tools/javapackages-tools.changes
2021-08-02 12:05:04.277656015 +0200
+++
/work/SRC/openSUSE:Factory/.javapackages-tools.new.1896/javapackages-tools.changes
2022-01-03 10:49:08.971574246 +0100
@@ -1,0 +2,6 @@
+Thu Dec 30 11:49:00 UTC 2021 - David Anes
+
+- Fix typo in suse-use-libdir.patch:
+ %{_libdir}/jvm-commmon -> %{_libdir}/jvm-common
+
+---
Other differences:
--
++ suse-use-libdir.patch ++
--- /var/tmp/diff_new_pack.QYnmIs/_old 2022-01-03 10:49:09.615574493 +0100
+++ /var/tmp/diff_new_pack.QYnmIs/_new 2022-01-03 10:49:09.615574493 +0100
@@ -98,7 +98,7 @@
# Root directory for all common architecture dependent parts of Java
VM/SDK/JRE's
#
-%_jvmcommonlibdir %{_prefix}/lib/jvm-common
-+%_jvmcommonlibdir %{_libdir}/jvm-commmon
++%_jvmcommonlibdir %{_libdir}/jvm-common
#
# Root directory for all common architecture independent parts of Java
VM/SDK/JRE's
commit javapackages-tools for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package javapackages-tools for
openSUSE:Factory checked in at 2021-08-02 12:04:41
Comparing /work/SRC/openSUSE:Factory/javapackages-tools (Old)
and /work/SRC/openSUSE:Factory/.javapackages-tools.new.1899 (New)
Package is "javapackages-tools"
Mon Aug 2 12:04:41 2021 rev:28 rq:908796 version:5.3.1
Changes:
--- /work/SRC/openSUSE:Factory/javapackages-tools/javapackages-tools.changes
2021-04-01 14:16:08.527882232 +0200
+++
/work/SRC/openSUSE:Factory/.javapackages-tools.new.1899/javapackages-tools.changes
2021-08-02 12:05:04.277656015 +0200
@@ -1,0 +2,5 @@
+Tue Jul 27 13:39:39 UTC 2021 - Fridrich Strba
+
+- Do not run tests on SLE12, since python3-test is not accessible
+
+---
Old:
_service
Other differences:
--
++ javapackages-tools.spec ++
--- /var/tmp/diff_new_pack.hdDO56/_old 2021-08-02 12:05:05.997655649 +0200
+++ /var/tmp/diff_new_pack.hdDO56/_new 2021-08-02 12:05:06.001655648 +0200
@@ -1,7 +1,7 @@
#
-# spec file for package javapackages-tools
+# spec file
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -61,7 +61,9 @@
Obsoletes: jpackage-utils < %{version}
%if %{with python}
BuildRequires: %{python_module lxml}
+%if 0%{?suse_version} > 1320
BuildRequires: %{python_module pytest}
+%endif
BuildRequires: %{python_module setuptools}
BuildRequires: %{python_module six}
BuildRequires: python-rpm-macros
@@ -101,7 +103,6 @@
This package contains files needed by local mode for Gradle, which
allows artifact resolution using XMvn resolver.
-
%package -n javapackages-ivy
Summary:Local mode for Apache Ivy (files)
Group: Development/Languages/Java
@@ -124,6 +125,7 @@
packaging in Linux distributions
%else
+
%package -n python3-javapackages
Summary:Module for handling various files for Java packaging
Group: Development/Languages/Java
@@ -216,6 +218,7 @@
%fdupes %{buildroot}/%{_prefix}
+%if 0%{?suse_version} > 1320
%check
# reference: ./check, but we don't want to check coverage and don't need old
nose
(
@@ -233,6 +236,7 @@
%pytest
popd
%endif
+%endif
%if !%{with python}
%files -f files-tools
@@ -241,6 +245,7 @@
%files -n javapackages-filesystem -f files-filesystem
%else
+
%files -n javapackages-local -f files-local
%dir %{_datadir}/java-utils
commit javapackages-tools for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package javapackages-tools for
openSUSE:Factory checked in at 2021-04-01 14:16:00
Comparing /work/SRC/openSUSE:Factory/javapackages-tools (Old)
and /work/SRC/openSUSE:Factory/.javapackages-tools.new.2401 (New)
Package is "javapackages-tools"
Thu Apr 1 14:16:00 2021 rev:27 rq:881405 version:5.3.1
Changes:
--- /work/SRC/openSUSE:Factory/javapackages-tools/javapackages-tools.changes
2020-12-03 18:38:23.825717554 +0100
+++
/work/SRC/openSUSE:Factory/.javapackages-tools.new.2401/javapackages-tools.changes
2021-04-01 14:16:08.527882232 +0200
@@ -1,0 +2,8 @@
+Thu Mar 25 16:27:58 UTC 2021 - Ben Greiner
+
+- Can't assume non-existence of python38 macros in Leap.
+ gh#openSUSE/python-rpm-macros#107
+ Test for suse_version instead. Only Tumbleweed has and needs the
+ python_subpackage_only support.
+
+---
Other differences:
--
++ javapackages-tools.spec ++
--- /var/tmp/diff_new_pack.XEa7fk/_old 2021-04-01 14:16:09.123883267 +0200
+++ /var/tmp/diff_new_pack.XEa7fk/_new 2021-04-01 14:16:09.127883273 +0200
@@ -66,8 +66,8 @@
BuildRequires: %{python_module six}
BuildRequires: python-rpm-macros
BuildArch: noarch
-%if 0%{?python38_version_nodots}
-# if python multiflavor is in place yet, use it to generate subpackages
+%if 0%{?suse_version} >= 1550
+# TW: generate subpackages for every python3 flavor
%define python_subpackage_only 1
%python_subpackages
%else
commit javapackages-tools for openSUSE:Factory
Hello community,
here is the log from the commit of package javapackages-tools for
openSUSE:Factory checked in at 2020-12-03 18:38:18
Comparing /work/SRC/openSUSE:Factory/javapackages-tools (Old)
and /work/SRC/openSUSE:Factory/.javapackages-tools.new.5913 (New)
Package is "javapackages-tools"
Thu Dec 3 18:38:18 2020 rev:26 rq:851469 version:5.3.1
Changes:
--- /work/SRC/openSUSE:Factory/javapackages-tools/javapackages-tools.changes
2020-11-26 23:13:06.208964299 +0100
+++
/work/SRC/openSUSE:Factory/.javapackages-tools.new.5913/javapackages-tools.changes
2020-12-03 18:38:23.825717554 +0100
@@ -1,0 +2,5 @@
+Sat Nov 28 09:37:25 UTC 2020 - Benjamin Greiner
+
+- Fix typo in spec file sitearch -> sitelib
+
+---
Other differences:
--
++ javapackages-tools.spec ++
--- /var/tmp/diff_new_pack.lGWsSR/_old 2020-12-03 18:38:24.365718577 +0100
+++ /var/tmp/diff_new_pack.lGWsSR/_new 2020-12-03 18:38:24.369718585 +0100
@@ -71,7 +71,7 @@
%define python_subpackage_only 1
%python_subpackages
%else
-%define python_sitearch %python3_sitearch
+%define python_sitelib %python3_sitelib
%define python_files() -n python3-%{**}
%endif
%else
___
openSUSE Commits mailing list -- commit@lists.opensuse.org
To unsubscribe, email commit-le...@lists.opensuse.org
List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette
List Archives:
https://lists.opensuse.org/archives/list/commit@lists.opensuse.org
[opensuse-commit] commit javapackages-tools for openSUSE:Factory
Hello community,
here is the log from the commit of package javapackages-tools for
openSUSE:Factory checked in at 2020-11-26 23:12:10
Comparing /work/SRC/openSUSE:Factory/javapackages-tools (Old)
and /work/SRC/openSUSE:Factory/.javapackages-tools.new.5913 (New)
Package is "javapackages-tools"
Thu Nov 26 23:12:10 2020 rev:25 rq:850199 version:5.3.1
Changes:
--- /work/SRC/openSUSE:Factory/javapackages-tools/javapackages-tools.changes
2020-09-08 22:55:25.147756246 +0200
+++
/work/SRC/openSUSE:Factory/.javapackages-tools.new.5913/javapackages-tools.changes
2020-11-26 23:13:06.208964299 +0100
@@ -1,0 +2,13 @@
+Sun Nov 22 00:23:21 UTC 2020 - Benjamin Greiner
+
+- Fix the python subpackage generation
+ gh#openSUSE/python-rpm-macros#79
+
+---
+Sat Nov 21 13:05:38 UTC 2020 - Benjamin Greiner
+
+- Support python subpackages for each flavor
+ gh#openSUSE/python-rpm-macros#66
+- Replace old nose with pytest gh#fedora-java/javapackages#86
+
+---
Other differences:
--
++ javapackages-tools.spec ++
--- /var/tmp/diff_new_pack.7wE1AE/_old 2020-11-26 23:13:08.140965910 +0100
+++ /var/tmp/diff_new_pack.7wE1AE/_new 2020-11-26 23:13:08.144965911 +0100
@@ -24,6 +24,8 @@
%bcond_with python
%endif
%if %{with python}
+%{?!python_module:%define python_module() python3-%{**}}
+%define skip_python2 1
Name: javapackages-tools-%{flavor}
%else
Name: javapackages-tools
@@ -58,11 +60,20 @@
Obsoletes: %{name}-doc
Obsoletes: jpackage-utils < %{version}
%if %{with python}
-BuildRequires: python3-lxml
-BuildRequires: python3-nose
-BuildRequires: python3-setuptools
-BuildRequires: python3-six
+BuildRequires: %{python_module lxml}
+BuildRequires: %{python_module pytest}
+BuildRequires: %{python_module setuptools}
+BuildRequires: %{python_module six}
+BuildRequires: python-rpm-macros
BuildArch: noarch
+%if 0%{?python38_version_nodots}
+# if python multiflavor is in place yet, use it to generate subpackages
+%define python_subpackage_only 1
+%python_subpackages
+%else
+%define python_sitearch %python3_sitearch
+%define python_files() -n python3-%{**}
+%endif
%else
Provides: mvn(com.sun:tools) = SYSTEM
Provides: mvn(sun.jdk:jconsole) = SYSTEM
@@ -101,6 +112,18 @@
This package contains files needed by local mode fow Apache Ivy, which
allows artifact resolution using XMvn resolver.
+%if 0%{?python_subpackage_only}
+%package -n python-javapackages
+Summary:Module for handling various files for Java packaging
+Group: Development/Languages/Java
+Requires: python-lxml
+Requires: python-six
+
+%description -n python-javapackages
+Module for handling, querying and manipulating of various files for Java
+packaging in Linux distributions
+
+%else
%package -n python3-javapackages
Summary:Module for handling various files for Java packaging
Group: Development/Languages/Java
@@ -112,6 +135,7 @@
%description -n python3-javapackages
Module for handling, querying and manipulating of various files for Java
packaging in Linux distributions
+%endif
%package -n javapackages-local
Summary:Non-essential macros and scripts for Java packaging support
@@ -142,7 +166,7 @@
./build
%if %{with python}
pushd python
-python3 setup.py build
+%python_build
popd
%endif
@@ -152,7 +176,7 @@
%if %{with python}
pushd python
-python3 setup.py install --root %{buildroot}
+%python_install
popd
# kill all the common files
files="
@@ -193,7 +217,22 @@
%fdupes %{buildroot}/%{_prefix}
%check
-./check
+# reference: ./check, but we don't want to check coverage and don't need old
nose
+(
+. ./config.status
+for test in test/java-functions/*_test.sh; do
+echo "`basename $test`:"
+sh $test
+done
+)
+%if %{with python}
+pushd ./python
+%pytest
+popd
+pushd ./test
+%pytest
+popd
+%endif
%if !%{with python}
%files -f files-tools
@@ -211,9 +250,9 @@
%files -n javapackages-ivy -f files-ivy
%dir %{_sysconfdir}/ant.d
-%files -n python3-javapackages
+%files %{python_files javapackages}
%license LICENSE
-%{python3_sitelib}/javapackages*
+%{python_sitelib}/javapackages*
%endif
%changelog
___
openSUSE Commits mailing list -- commit@lists.opensuse.org
To unsubscribe, email commit-le...@lists.opensuse.org
List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette
List Archives:
https://lists.opensuse.org/archives/list/commit@lists.opensuse.org
