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 <fst...@suse.com> + +- 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 <skippedPlugins> 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: 0004-Remove-dependency-on-Six-compatibility-library.patch +Patch3: javapackages-%{version}-maven-depmap.patch BuildRequires: asciidoc BuildRequires: fdupes BuildRequires: perl @@ -68,8 +65,6 @@ 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-rpm-macros @@ -124,9 +119,6 @@ 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 @@ -140,9 +132,6 @@ Requires: python3-lxml 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 @@ -162,15 +151,7 @@ %prep %setup -q -n javapackages-%{version} -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%if 0%{?suse_version} > 1320 -%patch6 -p1 -%endif +%autopatch -p1 # The usr/lib is hardcoded in configuration files too new_dir=$(echo %{_libdir} | sed 's#/##') @@ -264,7 +245,7 @@ %else -%files -n javapackages-local -f files-local +%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 ++++++ 5.3.1.tar.gz -> 6.1.0.tar.gz ++++++ ++++ 3864 lines of diff (skipped) ++++++ javapackages-6.1.0-maven-depmap.patch ++++++ ++++ 4442 lines (skipped) ++++++ python-optional.patch ++++++ --- /var/tmp/diff_new_pack.ZfzNg2/_old 2022-07-09 16:59:50.964509318 +0200 +++ /var/tmp/diff_new_pack.ZfzNg2/_new 2022-07-09 16:59:50.980509342 +0200 @@ -19,12 +19,12 @@ - -exec >files-python -(cd ./python && "${pyinterpreter}" setup.py install -O1 --skip-build --prefix "${prefix}" --root "${DEST}") >&2 --echo "${prefix}/lib/python?.?/site-packages/javapackages" --echo "${prefix}/lib/python?.?/site-packages/javapackages-*.egg-info" +-echo "${prefix}/lib/python*/site-packages/javapackages" +-echo "${prefix}/lib/python*/site-packages/javapackages-*.egg-info" Index: javapackages-5.2.0+git20180620.70fa2258/configure-base.sh =================================================================== ---- javapackages-5.2.0+git20180620.70fa2258.orig/configure-base.sh -+++ javapackages-5.2.0+git20180620.70fa2258/configure-base.sh +--- javapackages-5.2.0+git20180620.70fa2258.orig/configure ++++ javapackages-5.2.0+git20180620.70fa2258/configure @@ -57,7 +57,6 @@ test -z "${rpmconfigdir}" && rpmconfigdi test -z "${rpmmacrodir}" && rpmmacrodir="${rpmconfigdir}/macros.d" ++++++ suse-use-libdir.patch ++++++ --- /var/tmp/diff_new_pack.ZfzNg2/_old 2022-07-09 16:59:50.992509360 +0200 +++ /var/tmp/diff_new_pack.ZfzNg2/_new 2022-07-09 16:59:50.996509366 +0200 @@ -1,5 +1,5 @@ ---- javapackages-5.3.1/configure-base.sh 2019-06-14 12:26:27.000000000 +0200 -+++ javapackages-5.3.1/configure-base.sh 2020-07-16 09:04:37.316453132 +0200 +--- javapackages-5.3.1/configure 2019-06-14 12:26:27.000000000 +0200 ++++ javapackages-5.3.1/configure 2020-07-16 09:04:37.316453132 +0200 @@ -14,6 +14,7 @@ root_sysconfdir rpmconfigdir @@ -44,7 +44,7 @@ --- javapackages-5.3.1/expand.sh 2019-06-14 12:26:27.000000000 +0200 +++ javapackages-5.3.1/expand.sh 2020-07-16 09:04:37.316453132 +0200 @@ -45,6 +45,7 @@ - -e "s|@{scl_suffix}|${scl_suffix}|g" \ + sed \ -e "s|@{bindir}|${bindir}|g" \ -e "s|@{datadir}|${datadir}|g" \ + -e "s|@{libdir}|${libdir}|g" \ @@ -111,23 +111,4 @@ # # Root directory where all javadoc is installed. Also already in RH macros. ---- javapackages-5.3.1/macros.d/macros.scl-java-template 2019-06-14 12:26:27.000000000 +0200 -+++ javapackages-5.3.1/macros.d/macros.scl-java-template 2020-07-16 09:04:37.320453154 +0200 -@@ -50,11 +50,11 @@ - dir "%{_ivyxmldir}" \ - dir "%{_sysconfdir}/ivy" \ - dir "%{_datadir}/maven-metadata" \ -- dir "%{_prefix}/lib/eclipse" \ -- dir "%{_prefix}/lib/eclipse/features" \ -- dir "%{_prefix}/lib/eclipse/plugins" \ -- dir "%{_prefix}/lib/eclipse/dropins" \ -- dir "%{_prefix}/lib/eclipse/droplets" \ -+ dir "%{_libdir}/eclipse" \ -+ dir "%{_libdir}/eclipse/features" \ -+ dir "%{_libdir}/eclipse/plugins" \ -+ dir "%{_libdir}/eclipse/dropins" \ -+ dir "%{_libdir}/eclipse/droplets" \ - dir "%{_datadir}/eclipse" \ - dir "%{_datadir}/eclipse/dropins" \ - dir "%{_datadir}/eclipse/droplets" \
