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 2025-07-30 11:41:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/javapackages-tools (Old) and /work/SRC/openSUSE:Factory/.javapackages-tools.new.13279 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "javapackages-tools" Wed Jul 30 11:41:27 2025 rev:47 rq:1296198 version:6.4.1 Changes: -------- --- /work/SRC/openSUSE:Factory/javapackages-tools/javapackages-tools.changes 2024-10-12 13:25:04.998679555 +0200 +++ /work/SRC/openSUSE:Factory/.javapackages-tools.new.13279/javapackages-tools.changes 2025-07-30 11:41:57.290214108 +0200 @@ -1,0 +2,17 @@ +Mon Jul 28 17:05:19 UTC 2025 - Fridrich Strba <[email protected]> + +- Upgrade to upstream version 6.4.1 + * Changes + + Revert "jpackage_script: Remove unneeded backslashes" + + Initial implementation of %jp_binding macro + + Replace invalid $ escape in regex +- Removed patch: + * 0001-Revert-jpackage_script-Remove-unneeded-backslashes.patch + + integrated in this version +- Modified patches: + * python-optional.patch + * suse-no-epoch.patch + * suse-use-libdir.patch + + rediff to changed context + +------------------------------------------------------------------- Old: ---- 0001-Revert-jpackage_script-Remove-unneeded-backslashes.patch 6.3.4.tar.gz New: ---- 6.4.1.tar.gz ----------(Old B)---------- Old:- Removed patch: * 0001-Revert-jpackage_script-Remove-unneeded-backslashes.patch + integrated in this version ----------(Old E)---------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ javapackages-tools.spec ++++++ --- /var/tmp/diff_new_pack.01892S/_old 2025-07-30 11:41:58.906281072 +0200 +++ /var/tmp/diff_new_pack.01892S/_new 2025-07-30 11:41:58.906281072 +0200 @@ -1,7 +1,7 @@ # # spec file for package javapackages-tools # -# Copyright (c) 2024 SUSE LLC +# Copyright (c) 2025 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -30,7 +30,7 @@ %else Name: javapackages-tools %endif -Version: 6.3.4 +Version: 6.4.1 Release: 0 Summary: Macros and scripts for Java packaging support License: BSD-3-Clause @@ -45,8 +45,6 @@ #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-UPSTREAM: removing the backslashes breaks checks with rpm 4.14.1 -Patch3: 0001-Revert-jpackage_script-Remove-unneeded-backslashes.patch BuildRequires: fdupes BuildRequires: perl @@ -184,6 +182,7 @@ %{_sysconfdir}/java/eclipse.conf %{_datadir}/java-utils/java-functions %{_datadir}/java-utils/java-wrapper +%{_datadir}/java-utils/jp_binding.sh %{_datadir}/java-utils/scl-enable %{_rpmmacrodir}/macros.jpackage %{_rpmmacrodir}/macros.javapackages-filesystem ++++++ 6.3.4.tar.gz -> 6.4.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/javapackages-6.3.4/VERSION new/javapackages-6.4.1/VERSION --- old/javapackages-6.3.4/VERSION 2024-10-10 10:57:36.000000000 +0200 +++ new/javapackages-6.4.1/VERSION 2025-07-04 15:26:05.000000000 +0200 @@ -1 +1 @@ -6.3.4 +6.4.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/javapackages-6.3.4/build new/javapackages-6.4.1/build --- old/javapackages-6.3.4/build 2024-10-10 10:57:36.000000000 +0200 +++ new/javapackages-6.4.1/build 2025-07-04 15:26:05.000000000 +0200 @@ -67,6 +67,7 @@ expand macros.d/macros.fjava expand macros.d/macros.javapackages-compat expand java-utils/java-functions +expand java-utils/jp_binding.sh expand depgenerators/maven.req expand depgenerators/maven.prov expand depgenerators/osgi.req @@ -76,8 +77,12 @@ expand depgenerators/fileattrs/maven.attr expand depgenerators/fileattrs/javadoc.attr -while IFS== read -d' ' id path; do - echo "%java_home ${path}" >target/macros.fjava-"${id}" +while IFS== read -d' ' java_id java_home; do + expand macros.d/macros.javapackages-binding target/macros.java-"${java_id}" + sed -i \ + -e "s|@{java_id}|${java_id}|g" \ + -e "s|@{java_home}|${java_home}|g" \ + target/macros.java-"${java_id}" done <<<"${jvms}" manpage abs2rel diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/javapackages-6.3.4/configure new/javapackages-6.4.1/configure --- old/javapackages-6.3.4/configure 2024-10-10 10:57:36.000000000 +0200 +++ new/javapackages-6.4.1/configure 2025-07-04 15:26:05.000000000 +0200 @@ -60,6 +60,7 @@ jvmsysconfdir mavenpomdir ivyxmldir +jpbindingdir pyinterpreter abrtlibdir " diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/javapackages-6.3.4/expand.sh new/javapackages-6.4.1/expand.sh --- old/javapackages-6.3.4/expand.sh 2024-10-10 10:57:36.000000000 +0200 +++ new/javapackages-6.4.1/expand.sh 2025-07-04 15:26:05.000000000 +0200 @@ -45,6 +45,7 @@ -e "s|@{javadir}|${javadir}|g" \ -e "s|@{jnidir}|${jnidir}|g" \ -e "s|@{jvmdir}|${jvmdir}|g" \ + -e "s|@{jpbindingdir}|${jpbindingdir}|g" \ -e "s|@{m2home}|${m2home}|g" \ -e "s|@{prefix}|${prefix}|g" \ -e "s|@{rundir}|${rundir}|g" \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/javapackages-6.3.4/install new/javapackages-6.4.1/install --- old/javapackages-6.3.4/install 2024-10-10 10:57:36.000000000 +0200 +++ new/javapackages-6.4.1/install 2025-07-04 15:26:05.000000000 +0200 @@ -89,6 +89,7 @@ dir "${javadocdir}" dir "${mavenpomdir}" dir "${ivyxmldir}" +dir "${jpbindingdir}" dir "${datadir}/maven-metadata" dir "${prefix}/lib/eclipse" dir "${prefix}/lib/eclipse/features" @@ -125,6 +126,7 @@ inst_data target/java-functions "${javadir}-utils" inst_exec java-utils/java-wrapper "${javadir}-utils" +inst_exec target/jp_binding.sh "${javadir}-utils" inst_data target/macros.jpackage "${rpmmacrodir}" @@ -138,9 +140,9 @@ inst_data configs/configuration.xml "${m2home}" -while IFS== read -d' ' id path; do - exec >files-local-"${id}" - inst_data target/macros.fjava-"${id}" "${rpmmacrodir}" +while IFS== read -d' ' java_id java_path; do + exec >files-local-"${java_id}" + inst_data target/macros.java-"${java_id}" "${rpmmacrodir}" done <<<"${jvms}" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/javapackages-6.3.4/java-utils/jp_binding.sh new/javapackages-6.4.1/java-utils/jp_binding.sh --- old/javapackages-6.3.4/java-utils/jp_binding.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/javapackages-6.4.1/java-utils/jp_binding.sh 2025-07-04 15:26:05.000000000 +0200 @@ -0,0 +1,226 @@ +#!/bin/sh +# Copyright (c) 2024, Red Hat, Inc. +# +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the +# distribution. +# 3. Neither the name of the Red Hat nor the names of its +# contributors may be used to endorse or promote products derived +# from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# +# Authors: Mikolaj Izdebski <[email protected]> + +set -eu +jpbindingdir="@{jpbindingdir}" + +if [ -z "${RPM_BUILD_ROOT:-}" ]; then + echo RPM_BUILD_ROOT env variable has not been set >&2 + exit 1 +fi +if [ -z "${RPM_SPECPARTS_DIR:-}" ]; then + echo RPM_SPECPARTS_DIR env variable has not been set >&2 + exit 1 +fi + +rpmname="" +basepkg="" +pkg="" +ghost="" +target="" +variant="" +provides="" +requires="" +recommends="" +with_meta_requires=true +description="" +with_description=true +summary="" +with_summary=true +with_files=true +with_package=true +with_install=true +verbose=false + +while [ $# -gt 0 ]; do + case "$1" in + --rpm-name) + rpmname="$2" + shift + ;; + --base-pkg) + basepkg="$2" + shift + ;; + --binding-pkg) + pkg="$2" + shift + ;; + --ghost) + ghost="$2" + shift + ;; + --target) + target="$2" + shift + ;; + --variant) + variant="$2" + shift + ;; + --provides) + provides="${provides} +Provides: $2" + shift + ;; + --requires) + requires="${requires} +Requires: $2" + shift + ;; + --recommends) + recommends="${recommends} +Recommends: $2" + shift + ;; + --no-meta-requires) + with_meta_requires=false + ;; + --description) + description="$2" + shift + ;; + --no-description) + with_description=false + ;; + --summary) + summary="$2" + shift + ;; + --no-summary) + with_summary=false + ;; + --no-files) + with_files=false + ;; + --no-package) + with_package=false + ;; + --no-install) + with_install=false + ;; + --verbose) + verbose=true + ;; + *) + echo "Unknown option $1" >&2 + exit 1 + esac + shift +done + +debug() +{ + if ${verbose}; then + echo "$@" >&2 + fi +} + +if [ -z "${basepkg}" ]; then + if [ -n "${rpmname}" ]; then + basepkg="${rpmname}" + debug "Assuming default --base-pkg ${basepkg}" + else + echo "Missing required option --base-pkg" >&2 + exit 1 + fi +fi + +if [ -z "${ghost}" ]; then + echo "Missing required option --ghost" >&2 + exit 1 +fi + +if [ -z "${target}" ]; then + echo "Missing required option --target" >&2 + exit 1 +fi + +if [ -z "${variant}" ]; then + echo "Missing required option --variant" >&2 + exit 1 +fi + +if [ -z "${pkg}" ]; then + pkg="${basepkg}-${variant}" + debug "Assuming default --binding-pkg ${pkg}" +fi + +if [ -z "${summary}" ]; then + summary="${basepkg} binding for ${variant}" +fi + +if [ -z "${description}" ]; then + description="Configures ${basepkg} to work with ${variant}." +fi + +sp=${RPM_SPECPARTS_DIR}/${pkg}.specpart +: >${sp} + +if ${with_package}; then + echo "%package -n ${pkg}" >>${sp} + if ${with_summary}; then + echo "Summary: ${summary}" >>${sp} + fi + echo "${provides}" >>${sp} + echo "${requires}" >>${sp} + echo "${recommends}" >>${sp} + echo "Requires: javapackages-tools" >>${sp} + if ${with_meta_requires}; then + echo "Requires(meta): ${basepkg}" >>${sp} + fi + echo "" >>${sp} +fi + +if ${with_description}; then + echo "%description -n ${pkg}" >>${sp} + echo "${description}" | fold >>${sp} + echo "" >>${sp} +fi + +if ${with_files}; then + echo "%files -n ${pkg}" >>${sp} + echo "%ghost ${jpbindingdir}/${ghost}" >>${sp} + echo "%dir ${jpbindingdir}/${ghost}.d" >>${sp} + echo "${jpbindingdir}/${ghost}.d/${variant}" >>${sp} +fi + +if ${verbose}; then + debug "Added the following package:" + sed 's/./ :: &/' ${sp} >&2 +fi + +if ${with_install}; then + install -d -m 755 ${RPM_BUILD_ROOT}${jpbindingdir}/${ghost}.d/ + ln -sf ${target} ${RPM_BUILD_ROOT}${jpbindingdir}/${ghost}.d/${variant} +fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/javapackages-6.3.4/java-utils/mvn_build.py new/javapackages-6.4.1/java-utils/mvn_build.py --- old/javapackages-6.3.4/java-utils/mvn_build.py 2024-10-10 10:57:36.000000000 +0200 +++ new/javapackages-6.4.1/java-utils/mvn_build.py 2025-07-04 15:26:05.000000000 +0200 @@ -127,7 +127,7 @@ mvn_args.append("-Dxmvn.compat=20-rpmbuild-raw") if options.debug: - mvn_args.append("--debug") + mvn_args.append("-X") if options.xmvn_debug or options.debug: mvn_args.append("-Dxmvn.debug") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/javapackages-6.3.4/javapackages-tools.spec new/javapackages-6.4.1/javapackages-tools.spec --- old/javapackages-6.3.4/javapackages-tools.spec 2024-10-10 10:57:36.000000000 +0200 +++ new/javapackages-6.4.1/javapackages-tools.spec 2025-07-04 15:26:05.000000000 +0200 @@ -9,6 +9,8 @@ %global maven_home %{_usr}/share/xmvn +%global _jpbindingdir %{_datadir}/jpbinding + Name: javapackages-tools Version: [...] Release: %autorelease @@ -19,8 +21,6 @@ Source: https://github.com/fedora-java/javapackages/archive/%{version}.tar.gz -Source21: toolchains-openjdk21.xml - BuildRequires: coreutils BuildRequires: make BuildRequires: rubygem-asciidoctor @@ -48,12 +48,12 @@ %package -n maven-local-openjdk21 Summary: Macros and scripts for Maven packaging support -RemovePathPostfixes: -openjdk21 Requires: java-21-openjdk-devel Provides: maven-local = %{version}-%{release} Requires: %{name} = %{version}-%{release} Requires: javapackages-local-openjdk21 = %{version}-%{release} Requires: xmvn-minimal +Requires: xmvn-toolchain-openjdk21 Requires: mvn(org.fedoraproject.xmvn:xmvn-mojo) # Common Maven plugins required by almost every build. It wouldn't make # sense to explicitly require them in every package built with Maven. @@ -100,6 +100,7 @@ # Java build systems don't have hard requirement on java-devel, so it should be there Requires: java-21-openjdk-devel Requires: xmvn-generator +Requires: (ant-openjdk21 if ant) Obsoletes: javapackages-generators < 6.3.0 %description -n javapackages-local-openjdk21 @@ -146,9 +147,6 @@ rm -rf %{buildroot}%{_sysconfdir}/ant.d %endif -mkdir -p %{buildroot}%{maven_home}/conf/ -cp -p %{SOURCE21} %{buildroot}%{maven_home}/conf/toolchains.xml-openjdk21 - %if 0%{?flatpak} # make both /app (runtime deps) and /usr (build-only deps) builds discoverable sed -e '/^JAVA_LIBDIR=/s|$|:/usr/share/java|' \ @@ -169,6 +167,36 @@ %check ./check +%transfiletriggerin -- %{_jpbindingdir} +shopt -s nullglob +grep -E '^%{_jpbindingdir}/.*\.d/' | sed 's|%{_jpbindingdir}/\(.*\)/\(.*\)|\1 \2|' | while read dir tgt; do + lnk=${dir/%.d} + ln -sf "$dir/$tgt" %{_jpbindingdir}/"$lnk" +done + +%transfiletriggerun -- %{_jpbindingdir} +shopt -s nullglob +grep -E '^%{_jpbindingdir}/.*\.d/' | sed 's|%{_jpbindingdir}/\(.*\)/\(.*\)|\1 \2|' | while read dir tgt; do + lnk=${dir/%.d} + was=$(readlink %{_jpbindingdir}/"$lnk" || :) + if [[ "$was" = "$dir/$tgt" ]]; then + unlink %{_jpbindingdir}/"$lnk" + fi +done + +%transfiletriggerpostun -- %{_jpbindingdir} +shopt -s nullglob +for bindd in %{_jpbindingdir}/*.d/; do + lnk=${bindd/%.d\/} + if ! [[ -e "$lnk" ]]; then + for ftgt in "$bindd"*; do + tgt=$(realpath -m -s --relative-to=%{_jpbindingdir} "$ftgt") + ln -sf "$tgt" "$lnk" + break + done + fi +done + %files -f files-tools %if 0%{?flatpak} %{_usr}/bin/build-classpath @@ -184,8 +212,6 @@ %files -n javapackages-local-openjdk21 -f files-local-openjdk21 %files -n maven-local-openjdk21 -%dir %{maven_home}/conf -%{maven_home}/conf/toolchains.xml-openjdk21 %if %{with ivy} %files -n ivy-local -f files-ivy diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/javapackages-6.3.4/macros.d/macros.javapackages-binding new/javapackages-6.4.1/macros.d/macros.javapackages-binding --- old/javapackages-6.3.4/macros.d/macros.javapackages-binding 1970-01-01 01:00:00.000000000 +0100 +++ new/javapackages-6.4.1/macros.d/macros.javapackages-binding 2025-07-04 15:26:05.000000000 +0200 @@ -0,0 +1,2 @@ +# Home directory for Java @{java_id} +%java_home @{java_home} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/javapackages-6.3.4/macros.d/macros.javapackages-filesystem new/javapackages-6.4.1/macros.d/macros.javapackages-filesystem --- old/javapackages-6.3.4/macros.d/macros.javapackages-filesystem 2024-10-10 10:57:36.000000000 +0200 +++ new/javapackages-6.4.1/macros.d/macros.javapackages-filesystem 2025-07-04 15:26:05.000000000 +0200 @@ -80,3 +80,9 @@ # Directory for Ivy XML files # %_ivyxmldir %{_datadir}/ivy-xmls + +# +# Directory containing binding symlinks +# EXPERIMENTAL, subject to change or removal +# +%_jpbindingdir %{_datadir}/jpbinding diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/javapackages-6.3.4/macros.d/macros.jpackage new/javapackages-6.4.1/macros.d/macros.jpackage --- old/javapackages-6.3.4/macros.d/macros.jpackage 2024-10-10 10:57:36.000000000 +0200 +++ new/javapackages-6.4.1/macros.d/macros.jpackage 2025-07-04 15:26:05.000000000 +0200 @@ -35,9 +35,9 @@ #\ # %{name} script\ # JPackage Project <http://www.jpackage.org/>\ -%{?java_home: -# Set default JAVA_HOME -JAVA_HOME="\\${JAVA_HOME:-%{java_home}}" +%{?java_home:\ +# Set default JAVA_HOME\ +JAVA_HOME="\\${JAVA_HOME:-%{java_home}}"\ }\ # Source functions library\ . @{javadir}-utils/java-functions\ @@ -68,3 +68,10 @@ EOF\ chmod 755 %{buildroot}%{_bindir}/%5\ %{nil} + + +# +# Creates binding subpackages +# EXPERIMENTAL, subject to change or removal +# +%jp_binding @{javadir}-utils/jp_binding.sh --rpm-name %{name} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/javapackages-6.3.4/python/javapackages/maven/artifact.py new/javapackages-6.4.1/python/javapackages/maven/artifact.py --- old/javapackages-6.3.4/python/javapackages/maven/artifact.py 2024-10-10 10:57:36.000000000 +0200 +++ new/javapackages-6.4.1/python/javapackages/maven/artifact.py 2025-07-04 15:26:05.000000000 +0200 @@ -191,7 +191,7 @@ getattr(self, member) and isinstance(getattr(self, member), str)): curr_value = getattr(self, member) - prog = re.compile("\$\{([^}]+)\}") + prog = re.compile("\\$\{([^}]+)\}") props = prog.findall(curr_value) for key in props: try: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/javapackages-6.3.4/test/data/mvn_build/all_out new/javapackages-6.4.1/test/data/mvn_build/all_out --- old/javapackages-6.3.4/test/data/mvn_build/all_out 2024-10-10 10:57:36.000000000 +0200 +++ new/javapackages-6.4.1/test/data/mvn_build/all_out 2025-07-04 15:26:05.000000000 +0200 @@ -1 +1 @@ ---batch-mode --offline --debug -Dxmvn.debug -Dmaven.test.skip=true package org.fedoraproject.xmvn:xmvn-mojo:builddep +--batch-mode --offline -X -Dxmvn.debug -Dmaven.test.skip=true package org.fedoraproject.xmvn:xmvn-mojo:builddep diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/javapackages-6.3.4/test/data/mvn_build/debug_out new/javapackages-6.4.1/test/data/mvn_build/debug_out --- old/javapackages-6.3.4/test/data/mvn_build/debug_out 2024-10-10 10:57:36.000000000 +0200 +++ new/javapackages-6.4.1/test/data/mvn_build/debug_out 2025-07-04 15:26:05.000000000 +0200 @@ -1 +1 @@ ---batch-mode --offline --debug -Dxmvn.debug verify org.fedoraproject.xmvn:xmvn-mojo:install org.apache.maven.plugins:maven-javadoc-plugin:aggregate org.fedoraproject.xmvn:xmvn-mojo:builddep +--batch-mode --offline -X -Dxmvn.debug verify org.fedoraproject.xmvn:xmvn-mojo:install org.apache.maven.plugins:maven-javadoc-plugin:aggregate org.fedoraproject.xmvn:xmvn-mojo:builddep ++++++ python-optional.patch ++++++ --- /var/tmp/diff_new_pack.01892S/_old 2025-07-30 11:41:59.306297647 +0200 +++ /var/tmp/diff_new_pack.01892S/_new 2025-07-30 11:41:59.306297647 +0200 @@ -1,18 +1,24 @@ -Index: javapackages-5.2.0+git20180620.70fa2258/build -=================================================================== ---- javapackages-5.2.0+git20180620.70fa2258.orig/build -+++ javapackages-5.2.0+git20180620.70fa2258/build -@@ -117,5 +117,3 @@ manpage build-classpath +--- a/build ++++ b/build +@@ -114,5 +114,3 @@ manpage build-classpath manpage build-jar-repository manpage rebuild-jar-repository manpage shade-jar - -(cd ./python && "${pyinterpreter}" setup.py build) -Index: javapackages-5.2.0+git20180620.70fa2258/install -=================================================================== ---- javapackages-5.2.0+git20180620.70fa2258.orig/install -+++ javapackages-5.2.0+git20180620.70fa2258/install -@@ -253,8 +253,3 @@ exec >files-gradle +--- a/configure ++++ b/configure +@@ -85,7 +85,6 @@ test -z "${rpmconfigdir}" && rpmconfigdir="${prefix}/lib/rpm" + test -z "${rpmmacrodir}" && rpmmacrodir="${rpmconfigdir}/macros.d" + + test -z "${m2home}" && m2home="${datadir}/xmvn" +-test -z "${pyinterpreter}" && pyinterpreter=$(type -p python) + test -z "${abrtlibdir}" && abrtlibdir="${prefix}/lib/abrt-java-connector" + + eval $(sed -n 's/^%_\('"$vars_re"'\)\ *\(.*\)$/\1="\2"/;T;s/%{_\(.*}\)/${\1/;p' macros.d/macros.javapackages-filesystem) +--- a/install ++++ b/install +@@ -237,8 +237,3 @@ exec >files-gradle inst_exec target/gradle-local "${bindir}" inst_data gradle/init.gradle "${datadir}/gradle-local" inst_data target/gradle_build.7 "${mandir}/man7" @@ -21,16 +27,4 @@ -(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" -Index: 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" - - test -z "${m2home}" && m2home="${datadir}/xmvn" --test -z "${pyinterpreter}" && pyinterpreter=$(type -p python) - test -z "${abrtlibdir}" && abrtlibdir="${prefix}/lib/abrt-java-connector" - - eval $(sed -n 's/^%_\('"$vars_re"'\)\ *\(.*\)$/\1="\2"/;T;s/%{_\(.*}\)/${\1/;p' macros.d/macros.javapackages-filesystem) ++++++ suse-no-epoch.patch ++++++ --- /var/tmp/diff_new_pack.01892S/_old 2025-07-30 11:41:59.318298144 +0200 +++ /var/tmp/diff_new_pack.01892S/_new 2025-07-30 11:41:59.322298310 +0200 @@ -1,6 +1,6 @@ ---- javapackages-5.3.0/depgenerators/maven.req 2018-08-06 17:09:06.000000000 +0200 -+++ javapackages-5.3.0/depgenerators/maven.req 2018-10-24 10:29:11.404375107 +0200 -@@ -295,9 +295,9 @@ +--- a/depgenerators/maven.req ++++ b/depgenerators/maven.req +@@ -294,9 +294,9 @@ class TagBuilder(object): def _get_java_requires(self, reqs): major, minor = max([self._parse_java_requires(x) for x in reqs]) if minor: @@ -12,9 +12,9 @@ def _parse_java_requires(self, req): match = re.match(r'^(\d+)(?:\.(\d+))?$', req) ---- javapackages-5.3.0/test/maven_req_test.py 2018-08-06 17:09:06.000000000 +0200 -+++ javapackages-5.3.0/test/maven_req_test.py 2018-10-24 10:28:59.408310751 +0200 -@@ -30,7 +30,7 @@ +--- a/test/maven_req_test.py ++++ b/test/maven_req_test.py +@@ -30,7 +30,7 @@ class TestMavenReq(unittest.TestCase): self.assertEqual(return_value, 0, stderr) sout = [x for x in stdout.split('\n') if x] want = ("javapackages-filesystem", "mvn(org.apache.maven:maven-project)", @@ -23,7 +23,7 @@ self.assertEqual(set(want), set(sout)) @mavenreq(["require-java2/buildroot/usr/share/maven-metadata/require.xml"]) -@@ -38,7 +38,7 @@ +@@ -38,7 +38,7 @@ class TestMavenReq(unittest.TestCase): self.assertEqual(return_value, 0, stderr) sout = [x for x in stdout.split('\n') if x] want = ("javapackages-filesystem", "mvn(org.apache.maven:maven-project)", @@ -32,7 +32,7 @@ self.assertEqual(set(want), set(sout)) @mavenreq(["require-java3/buildroot/usr/share/maven-metadata/require.xml"]) -@@ -46,7 +46,7 @@ +@@ -46,7 +46,7 @@ class TestMavenReq(unittest.TestCase): self.assertEqual(return_value, 0, stderr) sout = [x for x in stdout.split('\n') if x] want = ("javapackages-filesystem", "mvn(org.apache.maven:maven-project)", @@ -41,7 +41,7 @@ self.assertEqual(set(want), set(sout)) @mavenreq(["require-java9/buildroot/usr/share/maven-metadata/require.xml"]) -@@ -54,7 +54,7 @@ +@@ -54,7 +54,7 @@ class TestMavenReq(unittest.TestCase): self.assertEqual(return_value, 0, stderr) sout = [x for x in stdout.split('\n') if x] want = ("javapackages-filesystem", "mvn(org.apache.maven:maven-project)", @@ -50,7 +50,7 @@ self.assertEqual(set(want), set(sout)) @mavenreq(["require-java10/buildroot/usr/share/maven-metadata/require.xml"]) -@@ -62,7 +62,7 @@ +@@ -62,7 +62,7 @@ class TestMavenReq(unittest.TestCase): self.assertEqual(return_value, 0, stderr) sout = [x for x in stdout.split('\n') if x] want = ("javapackages-filesystem", "mvn(org.apache.maven:maven-project)", @@ -59,7 +59,7 @@ self.assertEqual(set(want), set(sout)) @mavenreq(["require-java9and10/buildroot/usr/share/maven-metadata/require.xml"]) -@@ -70,7 +70,7 @@ +@@ -70,7 +70,7 @@ class TestMavenReq(unittest.TestCase): self.assertEqual(return_value, 0, stderr) sout = [x for x in stdout.split('\n') if x] want = ("javapackages-filesystem", "mvn(org.apache.maven:maven-project)", ++++++ suse-use-libdir.patch ++++++ --- /var/tmp/diff_new_pack.01892S/_old 2025-07-30 11:41:59.338298973 +0200 +++ /var/tmp/diff_new_pack.01892S/_new 2025-07-30 11:41:59.338298973 +0200 @@ -1,6 +1,6 @@ ---- 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 @@ +--- a/configure ++++ b/configure +@@ -43,6 +43,7 @@ sysconfdir root_sysconfdir rpmconfigdir rpmmacrodir @@ -8,7 +8,7 @@ m2home -@@ -51,6 +52,7 @@ +@@ -81,6 +82,7 @@ test -z "${mandir}" && mandir="${datadir}/man" test -z "${rundir}" && rundir="${localstatedir}/run" test -z "${sysconfdir}" && sysconfdir="${prefix}/etc" test -z "${root_sysconfdir}" && root_sysconfdir="${prefix}/etc" @@ -16,9 +16,8 @@ test -z "${rpmconfigdir}" && rpmconfigdir="${prefix}/lib/rpm" test -z "${rpmmacrodir}" && rpmmacrodir="${rpmconfigdir}/macros.d" -diff -urEbwB javapackages-5.3.1/etc/eclipse.conf javapackages-5.3.1/etc/eclipse.conf ---- javapackages-5.3.1/etc/eclipse.conf 2019-06-14 12:26:27.000000000 +0200 -+++ javapackages-5.3.1/etc/eclipse.conf 2020-07-16 09:04:37.316453132 +0200 +--- a/etc/eclipse.conf ++++ b/etc/eclipse.conf @@ -1,7 +1,7 @@ # Eclipse filesystem configuration file @@ -28,7 +27,7 @@ # Location of architecture-independant dropins eclipse.dropins.noarch=@{datadir}/eclipse/dropins -@@ -10,10 +10,10 @@ +@@ -10,10 +10,10 @@ eclipse.dropins.noarch=@{datadir}/eclipse/dropins eclipse.droplets.noarch=@{datadir}/eclipse/droplets # Location of architecture-dependant dropins @@ -41,9 +40,9 @@ # Comma-separated list of directories searched for external bundles eclipse.bundles=@{javadir},@{jnidir} ---- 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 @@ +--- a/expand.sh ++++ b/expand.sh +@@ -41,6 +41,7 @@ expand() sed \ -e "s|@{bindir}|${bindir}|g" \ -e "s|@{datadir}|${datadir}|g" \ @@ -51,11 +50,11 @@ -e "s|@{javaconfdir}|${javaconfdir}|g" \ -e "s|@{javadir}|${javadir}|g" \ -e "s|@{jnidir}|${jnidir}|g" \ ---- javapackages-5.3.1/install 2019-06-14 12:26:27.000000000 +0200 -+++ javapackages-5.3.1/install 2020-07-16 09:04:37.316453132 +0200 -@@ -90,11 +90,11 @@ - dir "${mavenpomdir}" +--- a/install ++++ b/install +@@ -91,11 +91,11 @@ dir "${mavenpomdir}" dir "${ivyxmldir}" + dir "${jpbindingdir}" dir "${datadir}/maven-metadata" -dir "${prefix}/lib/eclipse" -dir "${prefix}/lib/eclipse/features" @@ -70,8 +69,8 @@ dir "${datadir}/eclipse" dir "${datadir}/eclipse/dropins" dir "${datadir}/eclipse/droplets" ---- javapackages-5.3.1/macros.d/macros.javapackages-filesystem 2019-06-14 12:26:27.000000000 +0200 -+++ javapackages-5.3.1/macros.d/macros.javapackages-filesystem 2020-07-16 09:05:34.448792440 +0200 +--- a/macros.d/macros.javapackages-filesystem ++++ b/macros.d/macros.javapackages-filesystem @@ -13,17 +13,17 @@ # # Root directory where all Java VMs/SDK/JREs are installed.
