From d6826209a449946de843dc4b73fc1a22d5e84165 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Thu, 23 Jun 2022 08:37:43 +0200
Subject: [PATCH] Update to upstream version 6.1.0

---
 .gitignore                                    |  1 +
 0001-Update-ivy-local-classpath.patch         | 21 ----------
 ...Allow-running-check-without-coverage.patch | 40 -------------------
 javapackages-tools.spec                       | 19 +++++----
 sources                                       |  2 +-
 5 files changed, 11 insertions(+), 72 deletions(-)
 delete mode 100644 0001-Update-ivy-local-classpath.patch
 delete mode 100644 0002-Allow-running-check-without-coverage.patch

diff --git a/.gitignore b/.gitignore
index 0c87142..7bfb623 100644
--- a/.gitignore
+++ b/.gitignore
@@ -76,3 +76,4 @@
 /5.3.1.tar.gz
 /6.0.0~alpha.tar.gz
 /6.0.0.tar.gz
+/6.1.0.tar.gz
diff --git a/0001-Update-ivy-local-classpath.patch b/0001-Update-ivy-local-classpath.patch
deleted file mode 100644
index cb13ec7..0000000
--- a/0001-Update-ivy-local-classpath.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From ea8e50b737a8b8210417af767df50f6299d94d23 Mon Sep 17 00:00:00 2001
-From: Mikolaj Izdebski <mizdebsk@redhat.com>
-Date: Sun, 21 Nov 2021 11:19:41 +0100
-Subject: [PATCH 1/2] Update ivy-local-classpath
-
----
- configs/ivy-local-classpath | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configs/ivy-local-classpath b/configs/ivy-local-classpath
-index 9ab48d25..d65d6358 100644
---- a/configs/ivy-local-classpath
-+++ b/configs/ivy-local-classpath
-@@ -1,3 +1,3 @@
--xmvn/xmvn-connector-ivy
-+xmvn-connector-ivy/xmvn-connector-ivy
- xmvn/xmvn-launcher
- xmvn/xmvn-api
--- 
-2.35.3
-
diff --git a/0002-Allow-running-check-without-coverage.patch b/0002-Allow-running-check-without-coverage.patch
deleted file mode 100644
index 12d6093..0000000
--- a/0002-Allow-running-check-without-coverage.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From d12a3bbf7055d59e737d5b99f1afa848dba6ad42 Mon Sep 17 00:00:00 2001
-From: Mikolaj Izdebski <mizdebsk@redhat.com>
-Date: Tue, 14 Jun 2022 18:56:47 +0200
-Subject: [PATCH 2/2] Allow running check without coverage
-
----
- check | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/check b/check
-index 16e005a9..2305307d 100755
---- a/check
-+++ b/check
-@@ -47,8 +47,11 @@ if [ -z "$pyinterpreter" ]; then
-     exit 0
- fi
- 
-+cov_config=--cov-config=../.coveragerc
-+
- if ! coverage --version >/dev/null 2>&1; then
-     coverage(){ :;}
-+    cov_config=
- fi
- 
- cat >.coveragerc <<EOF
-@@ -65,9 +68,9 @@ export COVERAGE_PROCESS_START="${PWD}/.coveragerc"
- export PYTHONPATH="${PWD}/test/coverage${PYTHONPATH:+:}${PYTHONPATH:-}"
- 
- echo "Running Python tests with ${pyinterpreter}..."
--(cd ./python && "${pyinterpreter}" -m pytest -v --cov-config=../.coveragerc)
-+(cd ./python && "${pyinterpreter}" -m pytest -v ${cov_config})
- r1=$?
--(cd ./test && PYTHONPATH="${PWD}/../python${PYTHONPATH:+:}${PYTHONPATH:-}" "${pyinterpreter}" -m pytest -v --cov-config=../.coveragerc)
-+(cd ./test && PYTHONPATH="${PWD}/../python${PYTHONPATH:+:}${PYTHONPATH:-}" "${pyinterpreter}" -m pytest -v ${cov_config})
- r2=$?
- 
- if [ ${r1} -lt ${r2} ]; then
--- 
-2.35.3
-
diff --git a/javapackages-tools.spec b/javapackages-tools.spec
index da4bf64..53d0029 100644
--- a/javapackages-tools.spec
+++ b/javapackages-tools.spec
@@ -13,8 +13,8 @@
 %global maven_home %{_datadir}/xmvn
 
 Name:           javapackages-tools
-Version:        6.0.0
-Release:        10%{?dist}
+Version:        6.1.0
+Release:        1%{?dist}
 Summary:        Macros and scripts for Java packaging support
 License:        BSD
 URL:            https://github.com/fedora-java/javapackages
@@ -27,15 +27,12 @@ Source8:        toolchains-openjdk8.xml
 Source11:       toolchains-openjdk11.xml
 Source17:       toolchains-openjdk17.xml
 
-# Upstream patch for rhbz#2025272
-Patch0:         0001-Update-ivy-local-classpath.patch
-Patch1:         0002-Allow-running-check-without-coverage.patch
-
 BuildRequires:  coreutils
 BuildRequires:  which
 BuildRequires:  make
 BuildRequires:  asciidoc
 BuildRequires:  xmlto
+BuildRequires:  lua
 BuildRequires:  %{python_prefix}-devel
 BuildRequires:  %{python_prefix}-lxml
 BuildRequires:  %{python_prefix}-setuptools
@@ -128,6 +125,7 @@ scripts to support Java packaging.
 %package -n javapackages-extra
 Summary:        Rarely-used macros and scripts for Java packaging support
 Requires:       javapackages-generators = %{version}-%{release}
+Requires:       lua
 
 %description -n javapackages-extra
 This package provides rarely-used and obsolete macros and scripts to
@@ -162,8 +160,6 @@ OpenJDK 17 toolchain for XMvn
 
 %prep
 %setup -q -n javapackages-%{version}
-%patch0 -p1
-%patch1 -p1
 
 sed -i /javapackages-metadata.xml/d install
 
@@ -202,9 +198,9 @@ install -p -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/java/javapackages-config
 
 %files -n javapackages-generators -f files-generators
 
-%files -n javapackages-common -f files-local
+%files -n javapackages-common -f files-common
 
-%files -n javapackages-extra
+%files -n javapackages-extra -f files-extra
 
 %files -n javapackages-local
 
@@ -230,6 +226,9 @@ install -p -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/java/javapackages-config
 %license LICENSE
 
 %changelog
+* Thu Jun 23 2022 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.1.0-1
+- Update to upstream version 6.1.0
+
 * Tue Jun 14 2022 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.0.0-10
 - Introduce javapackages-extra and javapackages-common subpackages
 - Drop metadata for com.sun:tools and sun.jdk:jconsole
diff --git a/sources b/sources
index db19343..5196a71 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (6.0.0.tar.gz) = 2402aac750b8f9aa9789e2e7cf823a3aac626f6cc46717797f8b47ee1fab6fe340dc17034c8880b0161f65d053aa75c671ba9c18f0d9626b75a191d5e2d3cea4
+SHA512 (6.1.0.tar.gz) = c67f25add8117edcb5bc192157538f3b73579ee2a31e8eadf8e76a6264321503ec9e6d0439570b710ed510beccbf9db59a8aa43762fe560649d4eaf6742d314d