Hello community,
here is the log from the commit of package javapackages-tools for
openSUSE:Factory checked in at 2018-07-26 10:16:42
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/javapackages-tools (Old)
and /work/SRC/openSUSE:Factory/.javapackages-tools.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "javapackages-tools"
Thu Jul 26 10:16:42 2018 rev:16 rq:625189 version:5.2.0+git20180620.70fa2258
Changes:
--------
--- /work/SRC/openSUSE:Factory/javapackages-tools/javapackages-tools.changes
2018-01-30 15:41:51.693725658 +0100
+++
/work/SRC/openSUSE:Factory/.javapackages-tools.new/javapackages-tools.changes
2018-07-26 10:16:48.307763410 +0200
@@ -1,0 +2,27 @@
+Tue Jul 24 14:09:47 UTC 2018 - [email protected]
+
+- Switch to multibuild layout
+
+-------------------------------------------------------------------
+Tue Jul 24 13:45:21 UTC 2018 - [email protected]
+
+- Update to version 5.2.0+git20180620.70fa2258:
+ * Rename the async kwarg in call_script to wait (reverses the logic)
+ * Actually bump version to 5.3.0 snapshot
+ * Bump version in VERSION file
+ * [man] s/Pacakge/Package/g
+ * Fix typos in README
+ * Fix configure-base.sh after filesystem macro split
+ * Split filesystem macros to separate macro file
+ * Introduce javapackages-filesystem package
+ * [java-functions] extend ABRT Java agent options
+ * change abrt-java-connector upstream URL
+ * Remove resolverSettings/prefixes from XMvn config
+ * Add macros to allow passing arbitrary options to XMvn
+ * [spec] Bump package version to 5.1.0
+ * Allow specifying custom repo when calling xmvn-install
+- Refresh patches:
+ * suse-use-libdir.patch
+ * python-optional.patch
+
+-------------------------------------------------------------------
Old:
----
javapackages-5.0.0+git20180104.9367c8f6.tar.xz
javapackages-tools-extras.changes
javapackages-tools-extras.spec
pre_checkin.sh
New:
----
_multibuild
javapackages-5.2.0+git20180620.70fa2258.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ javapackages-tools.spec ++++++
--- /var/tmp/diff_new_pack.fUmF3M/_old 2018-07-26 10:16:49.819766154 +0200
+++ /var/tmp/diff_new_pack.fUmF3M/_new 2018-07-26 10:16:49.823766162 +0200
@@ -16,14 +16,23 @@
#
+%global flavor @BUILD_FLAVOR@%{nil}
+%if "%{flavor}" == "extras"
+%bcond_without python
+%else
%bcond_with python
+%endif
+%if %{with python}
+Name: javapackages-tools-%{flavor}
+%else
Name: javapackages-tools
-Version: 5.0.0+git20180104.9367c8f6
+%endif
+Version: 5.2.0+git20180620.70fa2258
Release: 0
Summary: Macros and scripts for Java packaging support
License: BSD-3-Clause
Group: Development/Languages/Java
-Url: https://github.com/fedora-java/javapackages
+URL: https://github.com/fedora-java/javapackages
# Latest tag is missing, quite often needs patches, use service
Source: javapackages-%{version}.tar.xz
#PATCH-FIX-SUSE: SUSE does store jvm related things in libdir - ie /usr/lib64
on 64bits
@@ -146,7 +155,8 @@
%{_datadir}/java-utils/java-functions
%{_datadir}/java-utils/java-wrapper
%{_datadir}/java-utils/scl-enable
-%{_prefix}/lib/rpm/macros.d/macros.jpackage
+%{_libexecdir}/rpm/macros.d/macros.jpackage
+%{_libexecdir}/rpm/macros.d/macros.javapackages-filesystem
%{_mandir}/man1/build-classpath.1
%{_mandir}/man1/build-jar-repository.1
%{_mandir}/man1/diff-jars.1
@@ -159,6 +169,9 @@
for i in $files; do
rm -rf %{buildroot}/$i
done
+%else
+# we want this in the basic package always
+cat files-filesystem >> files-tools
%endif
rm -rf %{buildroot}%{_datadir}/fedora-review/
@@ -169,8 +182,9 @@
./check
%if !%{with python}
-%files -f files-common
-%doc LICENSE
+%files -f files-tools
+%license LICENSE
+%dir %{_datadir}/maven-metadata
%else
%files -n javapackages-local -f files-local
%dir %{_datadir}/java-utils
@@ -184,7 +198,7 @@
%dir %{_sysconfdir}/ant.d
%files -n python3-javapackages
-%doc LICENSE
+%license LICENSE
%{python3_sitelib}/javapackages*
%endif
++++++ _multibuild ++++++
<multibuild>
<package>extras</package>
</multibuild>
++++++ _service ++++++
--- /var/tmp/diff_new_pack.fUmF3M/_old 2018-07-26 10:16:49.859766227 +0200
+++ /var/tmp/diff_new_pack.fUmF3M/_new 2018-07-26 10:16:49.859766227 +0200
@@ -4,7 +4,7 @@
<param name="scm">git</param>
<param name="changesgenerate">enable</param>
<param name="filename">javapackages</param>
- <param name="versionformat">5.0.0+git%cd.%h</param>
+ <param name="versionformat">5.2.0+git%cd.%h</param>
</service>
<service mode="disabled" name="recompress">
<param name="file">*.tar</param>
++++++ javapackages-5.0.0+git20180104.9367c8f6.tar.xz ->
javapackages-5.2.0+git20180620.70fa2258.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/javapackages-5.0.0+git20180104.9367c8f6/README.md
new/javapackages-5.2.0+git20180620.70fa2258/README.md
--- old/javapackages-5.0.0+git20180104.9367c8f6/README.md 2018-01-04
14:06:42.000000000 +0100
+++ new/javapackages-5.2.0+git20180620.70fa2258/README.md 2018-06-20
12:13:47.000000000 +0200
@@ -1,9 +1,9 @@
[](https://travis-ci.org/fedora-java/javapackages)
[](https://codecov.io/gh/fedora-java/javapackages)
Java Packages Tools is a collection of tools that make it easier to
-build RPM packages containing software running on Java platform.
+build RPM packages containing software running on the Java platform.
-Java Packages Tools is free software. You can redistribute and/or
+Java Packages Tools is free software. You can redistribute and/or
modify it under the terms specified in the LICENSE file.
This software comes with ABSOLUTELY NO WARRANTY.
@@ -11,12 +11,12 @@
Contact
-------
-Java Packages Tools is a community project, new contributotrs are
-welcome. The most straightforward way to introduce new features is
-writting them yourself. The preferred way to requests features and
-report bugs is through Github.
+Java Packages Tools is a community project, new contributors are
+welcome. The most straightforward way to introduce new features is
+writing them yourself. The preferred way to request features and
+report bugs is through GitHub.
The easiest way to get support is asking on IRC -- #fedora-java on
-freenode. You can also write to Fedora Java list
-<[email protected]> or directly to Java Packages
+freenode. You can also write to the Fedora Java list
+<[email protected]> or directly to the Java Packages
Tools maintainers <[email protected]>.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/javapackages-5.0.0+git20180104.9367c8f6/VERSION
new/javapackages-5.2.0+git20180620.70fa2258/VERSION
--- old/javapackages-5.0.0+git20180104.9367c8f6/VERSION 2018-01-04
14:06:42.000000000 +0100
+++ new/javapackages-5.2.0+git20180620.70fa2258/VERSION 2018-06-20
12:13:47.000000000 +0200
@@ -1 +1 @@
-5.0.0.dev1
+5.3.0.dev1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/javapackages-5.0.0+git20180104.9367c8f6/configs/configuration-SCL.xml
new/javapackages-5.2.0+git20180620.70fa2258/configs/configuration-SCL.xml
--- old/javapackages-5.0.0+git20180104.9367c8f6/configs/configuration-SCL.xml
2018-01-04 14:06:42.000000000 +0100
+++ new/javapackages-5.2.0+git20180620.70fa2258/configs/configuration-SCL.xml
2018-06-20 12:13:47.000000000 +0200
@@ -5,9 +5,6 @@
<repository>@{scl_root}/usr/share/maven-metadata</repository>
</metadataRepositories>
<ignoreDuplicateMetadata>false</ignoreDuplicateMetadata>
- <prefixes>
- <prefix>@{scl_root}/</prefix>
- </prefixes>
</resolverSettings>
<installerSettings>
<metadataDir>@{scl_root_relative}/usr/share/maven-metadata</metadataDir>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/javapackages-5.0.0+git20180104.9367c8f6/configs/configuration.xml
new/javapackages-5.2.0+git20180620.70fa2258/configs/configuration.xml
--- old/javapackages-5.0.0+git20180104.9367c8f6/configs/configuration.xml
2018-01-04 14:06:42.000000000 +0100
+++ new/javapackages-5.2.0+git20180620.70fa2258/configs/configuration.xml
2018-06-20 12:13:47.000000000 +0200
@@ -4,9 +4,6 @@
<metadataRepositories>
<repository>/usr/share/maven-metadata</repository>
</metadataRepositories>
- <prefixes>
- <prefix>/</prefix>
- </prefixes>
</resolverSettings>
<installerSettings>
<metadataDir>usr/share/maven-metadata</metadataDir>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/javapackages-5.0.0+git20180104.9367c8f6/configure-base.sh
new/javapackages-5.2.0+git20180620.70fa2258/configure-base.sh
--- old/javapackages-5.0.0+git20180104.9367c8f6/configure-base.sh
2018-01-04 14:06:42.000000000 +0100
+++ new/javapackages-5.2.0+git20180620.70fa2258/configure-base.sh
2018-06-20 12:13:47.000000000 +0200
@@ -58,7 +58,7 @@
test -z "${pyinterpreter}" && pyinterpreter=$(which 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.jpackage)
+eval $(sed -n 's/^%_\('"$vars_re"'\)\
*\(.*\)$/\1="\2"/;T;s/%{_\(.*}\)/${\1/;p'
macros.d/macros.javapackages-filesystem)
test -z "${default_jdk}" && default_jdk="${jvmdir}/java"
test -z "${default_jre}" && default_jre="${jvmdir}/jre"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/javapackages-5.0.0+git20180104.9367c8f6/etc/java.conf
new/javapackages-5.2.0+git20180620.70fa2258/etc/java.conf
--- old/javapackages-5.0.0+git20180104.9367c8f6/etc/java.conf 2018-01-04
14:06:42.000000000 +0100
+++ new/javapackages-5.2.0+git20180620.70fa2258/etc/java.conf 2018-06-20
12:13:47.000000000 +0200
@@ -13,5 +13,5 @@
#JAVACMD_OPTS=
# You can disable ABRT Java Connector by setting JAVA_ABRT to "off".
-# See: https://github.com/jfilak/abrt-java-connector/
+# See: https://github.com/abrt/abrt-java-connector/
#JAVA_ABRT=off
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/javapackages-5.0.0+git20180104.9367c8f6/install
new/javapackages-5.2.0+git20180620.70fa2258/install
--- old/javapackages-5.0.0+git20180104.9367c8f6/install 2018-01-04
14:06:42.000000000 +0100
+++ new/javapackages-5.2.0+git20180620.70fa2258/install 2018-06-20
12:13:47.000000000 +0200
@@ -70,7 +70,8 @@
echo "%doc ${1}"
}
-exec >files-common
+
+exec >files-filesystem
dir "${javaconfdir}"
dir "${javaconfdir}/security"
@@ -84,13 +85,11 @@
dir "${jvmcommondatadir}"
dir "${jvmcommonsysconfdir}"
dir "${javadir}"
-dir "${javadir}-utils"
dir "${jnidir}"
dir "${javadocdir}"
dir "${mavenpomdir}"
dir "${ivyxmldir}"
dir "${datadir}/maven-metadata"
-dir "${m2home}"
dir "${prefix}/lib/eclipse"
dir "${prefix}/lib/eclipse/features"
dir "${prefix}/lib/eclipse/plugins"
@@ -99,7 +98,17 @@
dir "${datadir}/eclipse"
dir "${datadir}/eclipse/dropins"
dir "${datadir}/eclipse/droplets"
-dir "${rpmconfigdir}"
+
+if [[ -z "${scl}" ]]; then
+ # in scl, macros.javapackages-filesystem is installed in javapackages-local
+ inst_data macros.d/macros.javapackages-filesystem "${rpmmacrodir}"
+fi
+
+
+exec >files-tools
+
+dir "${m2home}"
+dir "${javadir}-utils"
dir "${rpmconfigdir}"
if [[ -n "${scl}" ]]; then
dir "${javadir}-utils/scl-template"
@@ -176,10 +185,12 @@
inst_data java-utils/mvn_package.py "${javadir}-utils"
if [[ -n "${scl}" ]]; then
- # Base RHEL contains macros in /etc/ that would override ours.
- # We need to place ours there alphabetically after to prevent that.
- # Additionally we move macros.jpackage to javapackages-local, so they don't
- # interfere with base RHEL if only javapackages-tools is installed.
+ # Base RHEL contains macros in /etc/ that would override ours. We need to
+ # place ours there alphabetically after to prevent that. Additionally we
+ # move macros.{jpackage,javapackages-filesystem} to javapackages-local, so
+ # they don't interfere with base RHEL if only javapackages-tools is
+ # installed.
+ inst_data macros.d/macros.javapackages-filesystem "${rpmmacrodir}"
"macros.x-${scl}.javapackages-filesystem"
inst_data target/macros.fjava "${rpmmacrodir}" "macros.x-${scl}.fjava"
inst_data target/macros.jpackage "${rpmmacrodir}"
"macros.x-${scl}.jpackage"
inst_data target/macros.scl-java-template "${rpmmacrodir}"
"macros.${scl}.scl-java-template"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/javapackages-5.0.0+git20180104.9367c8f6/java-utils/java-functions
new/javapackages-5.2.0+git20180620.70fa2258/java-utils/java-functions
--- old/javapackages-5.0.0+git20180104.9367c8f6/java-utils/java-functions
2018-01-04 14:06:42.000000000 +0100
+++ new/javapackages-5.2.0+git20180620.70fa2258/java-utils/java-functions
2018-06-20 12:13:47.000000000 +0200
@@ -106,12 +106,20 @@
JAVACMD_OPTS="${java_opts_save}"
fi
- if [ "_${JAVA_ABRT}" != "_off" -a -f
"@{abrtlibdir}/libabrt-java-connector.so" -a -f "@{rundir}/abrt/abrtd.pid" ];
then
- _log "ABRT Java connector was enabled"
- _log "Using ABRT Java agent: @{abrtlibdir}/libabrt-java-connector.so"
- JAVACMD_OPTS="${JAVACMD_OPTS}
-agentpath:@{abrtlibdir}/libabrt-java-connector.so=abrt=on"
+ if [ "_${JAVA_ABRT}" != "_off" -a -f
"@{abrtlibdir}/libabrt-java-connector.so" ]; then
+ if [ -f "@{rundir}/abrt/abrtd.pid" ]; then
+ ABRT_JAVA_CONNECTOR_OPTS="abrt=on,"
+ fi
+ if [ -f "@{bindir}/container-exception-logger" ]; then
+ ABRT_JAVA_CONNECTOR_OPTS+="cel=on"
+ fi
+ if [ ! -z ${ABRT_JAVA_CONNECTOR_OPTS} ]; then
+ _log "ABRT Java connector was enabled"
+ _log "Using ABRT Java agent:
@{abrtlibdir}/libabrt-java-connector.so=${ABRT_JAVA_CONNECTOR_OPTS}"
+ JAVACMD_OPTS="${JAVACMD_OPTS}
-agentpath:@{abrtlibdir}/libabrt-java-connector.so=${ABRT_JAVA_CONNECTOR_OPTS}"
+ fi
else
- _log "ABRT Java connector is disabled"
+ _log "ABRT Java connector is disabled"
fi
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/javapackages-5.0.0+git20180104.9367c8f6/javapackages-tools.spec
new/javapackages-5.2.0+git20180620.70fa2258/javapackages-tools.spec
--- old/javapackages-5.0.0+git20180104.9367c8f6/javapackages-tools.spec
2018-01-04 14:06:42.000000000 +0100
+++ new/javapackages-5.2.0+git20180620.70fa2258/javapackages-tools.spec
2018-06-20 12:13:47.000000000 +0200
@@ -24,7 +24,7 @@
%global default_jre
%{?_root_prefix}%{!?_root_prefix:%{_prefix}}/lib/jvm/jre-1.8.0-openjdk
Name: %{?scl_prefix}%{pkg_name}
-Version: 5.0.0
+Version: 5.3.0
Release: 0.git.%(date +%%Y%%m%%d.%%H%%M%%S)
Summary: Macros and scripts for Java packaging support
@@ -47,14 +47,13 @@
BuildRequires: %{python_prefix}-nose
BuildRequires: %{python_prefix}-six
+Requires: %{?scl_prefix}javapackages-filesystem = %{version}-%{release}
Requires: coreutils
Requires: findutils
Requires: which
# default JRE
Requires: java-1.8.0-openjdk-headless
-Obsoletes: %{?scl_prefix}eclipse-filesystem < 2
-Provides: %{?scl_prefix}eclipse-filesystem = %{version}-%{release}
Provides: %{?scl_prefix}jpackage-utils = %{version}-%{release}
# These could be generated automatically, but then we would need to
# depend on javapackages-local for dependency generator.
@@ -64,6 +63,15 @@
%description
This package provides macros and scripts to support Java packaging.
+%package -n %{?scl_prefix}javapackages-filesystem
+Summary: Java packages filesystem layout
+Obsoletes: %{?scl_prefix}eclipse-filesystem < 2
+Provides: %{?scl_prefix}eclipse-filesystem = %{version}-%{release}
+
+%description -n %{?scl_prefix}javapackages-filesystem
+This package provides some basic directories into which Java packages
+install their content.
+
%package -n %{?scl_prefix}maven-local
Summary: Macros and scripts for Maven packaging support
Requires: %{name} = %{version}-%{release}
@@ -162,7 +170,9 @@
./check
%endif
-%files -f files-common
+%files -f files-tools
+
+%files -n %{?scl_prefix}javapackages-filesystem -f files-filesystem
%files -n %{?scl_prefix}javapackages-local -f files-local
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/javapackages-5.0.0+git20180104.9367c8f6/macros.d/macros.fjava
new/javapackages-5.2.0+git20180620.70fa2258/macros.d/macros.fjava
--- old/javapackages-5.0.0+git20180104.9367c8f6/macros.d/macros.fjava
2018-01-04 14:06:42.000000000 +0100
+++ new/javapackages-5.2.0+git20180620.70fa2258/macros.d/macros.fjava
2018-06-20 12:13:47.000000000 +0200
@@ -131,7 +131,7 @@
#
# For summary of accepted options execute `mvn-build --help` command.
#
-%mvn_build %{?scl:@{javadir}-utils/scl-enable %{?scl_maven} %{scl} --
}@{pyinterpreter} @{javadir}-utils/mvn_build.py %{?xmvn_bootstrap: -b}
%{?_without_javadoc: -j $(> .mfiles-javadoc)}%{?_without_tests: -f}
+%mvn_build %{?scl:@{javadir}-utils/scl-enable %{?scl_maven} %{scl} --
}@{pyinterpreter} @{javadir}-utils/mvn_build.py %{?base_xmvn_opts}
%{?xmvn_opts} %{?xmvn_bootstrap: -b} %{?_without_javadoc: -j $(>
.mfiles-javadoc)}%{?_without_tests: -f}
# %gradle_build - build Gradle project
@@ -143,7 +143,7 @@
#
# For summary of accepted options execute `mvn-build --help` command.
#
-%gradle_build %{?scl:@{javadir}-utils/scl-enable %{?scl_maven} %{scl} --
}@{pyinterpreter} @{javadir}-utils/mvn_build.py --gradle %{?xmvn_bootstrap: -b}
%{?_without_javadoc: -j $(> .mfiles-javadoc)}%{?_without_tests: -f}
+%gradle_build %{?scl:@{javadir}-utils/scl-enable %{?scl_maven} %{scl} --
}@{pyinterpreter} @{javadir}-utils/mvn_build.py --gradle %{?base_xmvn_opts}
%{?xmvn_opts} %{?xmvn_bootstrap: -b} %{?_without_javadoc: -j $(>
.mfiles-javadoc)}%{?_without_tests: -f}
# %mvn_install - install Maven project
@@ -153,7 +153,7 @@
# This macro causes previously built Maven project to be installed into
# buildroot. It is intended to be placed in %install section of spec file.
#
-%mvn_install(J:X) %{?scl:@{javadir}-utils/scl-enable %{?scl_maven} %{scl} --
}xmvn-install %{?-X} -R .xmvn-reactor -n %{?scl:%{pkg_name}}%{!?scl:%{name}} -d
"%{buildroot}" \
+%mvn_install(J:X) %{?scl:@{javadir}-utils/scl-enable %{?scl_maven} %{scl} --
}xmvn-install %{?base_xmvn_opts} %{?xmvn_install_opts} %{?-X} -R .xmvn-reactor
-n %{?scl:%{pkg_name}}%{!?scl:%{name}} %{?xmvn_install_repo:-i
%{xmvn_install_repo}} -d "%{buildroot}" \
%{-J*:jdir="%{-J*}"}%{!-J*:jdir=target/site/apidocs; [ -d .xmvn/apidocs ] &&
jdir=.xmvn/apidocs} \
%{__mkdir_p} %{buildroot}%{_licensedir} \
if [ -d "${jdir}" ]; then \
@@ -170,7 +170,7 @@
#
# Substitutes Java archives in given directory with symlinks to system-wide or
# just installed versions.
-%mvn_subst %{?scl:@{javadir}-utils/scl-enable %{?scl_maven} %{scl} --
}xmvn-subst -R %{buildroot}
+%mvn_subst %{?scl:@{javadir}-utils/scl-enable %{?scl_maven} %{scl} --
}xmvn-subst %{?base_xmvn_opts} %{?xmvn_subst_opts} -R %{buildroot}
#==============================================================================
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/javapackages-5.0.0+git20180104.9367c8f6/macros.d/macros.javapackages-filesystem
new/javapackages-5.2.0+git20180620.70fa2258/macros.d/macros.javapackages-filesystem
---
old/javapackages-5.0.0+git20180104.9367c8f6/macros.d/macros.javapackages-filesystem
1970-01-01 01:00:00.000000000 +0100
+++
new/javapackages-5.2.0+git20180620.70fa2258/macros.d/macros.javapackages-filesystem
2018-06-20 12:13:47.000000000 +0200
@@ -0,0 +1,82 @@
+#
+# RPM macros for Java filesystem layout.
+#
+# JPackage Project <http://www.jpackage.org/>
+# David Walluck <[email protected]>
+# Ville Skyttä <scop at jpackage.org>
+# Nicolas Mailhot <[email protected]>
+#
+
+#==============================================================================
+# ---- default Java directories
+
+#
+# Root directory where all Java VMs/SDK/JREs are installed.
+#
+%_jvmdir %{_prefix}/lib/jvm
+
+#
+# Root directory for all Java VM/SDK/JRE's private things.
+#
+%_jvmprivdir %{_prefix}/lib/jvm-private
+
+#
+# Root directory for all architecture dependent parts of Java VM/SDK/JRE's
+#
+%_jvmlibdir %{_prefix}/lib/jvm
+
+#
+# Root directory for all architecture independent parts of Java VM/SDK/JRE's
+#
+%_jvmdatadir %{_datadir}/jvm
+
+#
+# Root directory for all configurations parts of Java VM/SDK/JRE's
+#
+%_jvmsysconfdir %{_sysconfdir}/jvm
+
+#
+# Root directory for all common architecture dependent parts of Java
VM/SDK/JRE's
+#
+%_jvmcommonlibdir %{_prefix}/lib/jvm-commmon
+
+#
+# Root directory for all common architecture independent parts of Java
VM/SDK/JRE's
+#
+%_jvmcommondatadir %{_datadir}/jvm-commmon
+
+#
+# Root directory for all common configurations parts of Java VM/SDK/JRE's
+#
+%_jvmcommonsysconfdir %{_sysconfdir}/jvm-commmon
+
+#
+# Directory containing Java configuration file (java.conf)
+#
+%_javaconfdir %{_sysconfdir}/java
+
+#
+# Directory where arch and version independent jars are installed.
+# This has already been integrated in RH macros following our request.
+#
+%_javadir %{_datadir}/java
+
+#
+# Directory where arch-specific (JNI) version-independent jars are installed.
+#
+%_jnidir %{_prefix}/lib/java
+
+#
+# Root directory where all javadoc is installed. Also already in RH macros.
+#
+%_javadocdir %{_datadir}/javadoc
+
+#
+# Directory for Maven POM files
+#
+%_mavenpomdir %{_datadir}/maven-poms
+
+#
+# Directory for Ivy XML files
+#
+%_ivyxmldir %{_datadir}/ivy-xmls
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/javapackages-5.0.0+git20180104.9367c8f6/macros.d/macros.jpackage
new/javapackages-5.2.0+git20180620.70fa2258/macros.d/macros.jpackage
--- old/javapackages-5.0.0+git20180104.9367c8f6/macros.d/macros.jpackage
2018-01-04 14:06:42.000000000 +0100
+++ new/javapackages-5.2.0+git20180620.70fa2258/macros.d/macros.jpackage
2018-06-20 12:13:47.000000000 +0200
@@ -7,81 +7,6 @@
# Nicolas Mailhot <[email protected]>
#
-#==============================================================================
-# ---- default Java directories
-
-#
-# Root directory where all Java VMs/SDK/JREs are installed.
-#
-%_jvmdir %{_prefix}/lib/jvm
-
-#
-# Root directory for all Java VM/SDK/JRE's private things.
-#
-%_jvmprivdir %{_prefix}/lib/jvm-private
-
-#
-# Root directory for all architecture dependent parts of Java VM/SDK/JRE's
-#
-%_jvmlibdir %{_prefix}/lib/jvm
-
-#
-# Root directory for all architecture independent parts of Java VM/SDK/JRE's
-#
-%_jvmdatadir %{_datadir}/jvm
-
-#
-# Root directory for all configurations parts of Java VM/SDK/JRE's
-#
-%_jvmsysconfdir %{_sysconfdir}/jvm
-
-#
-# Root directory for all common architecture dependent parts of Java
VM/SDK/JRE's
-#
-%_jvmcommonlibdir %{_prefix}/lib/jvm-commmon
-
-#
-# Root directory for all common architecture independent parts of Java
VM/SDK/JRE's
-#
-%_jvmcommondatadir %{_datadir}/jvm-commmon
-
-#
-# Root directory for all common configurations parts of Java VM/SDK/JRE's
-#
-%_jvmcommonsysconfdir %{_sysconfdir}/jvm-commmon
-
-#
-# Directory containing Java configuration file (java.conf)
-#
-%_javaconfdir %{_sysconfdir}/java
-
-#
-# Directory where arch and version independent jars are installed.
-# This has already been integrated in RH macros following our request.
-#
-%_javadir %{_datadir}/java
-
-#
-# Directory where arch-specific (JNI) version-independent jars are installed.
-#
-%_jnidir %{_prefix}/lib/java
-
-#
-# Root directory where all javadoc is installed. Also already in RH macros.
-#
-%_javadocdir %{_datadir}/javadoc
-
-#
-# Directory for Maven POM files
-#
-%_mavenpomdir %{_datadir}/maven-poms
-
-#
-# Directory for Ivy XML files
-#
-%_ivyxmldir %{_datadir}/ivy-xmls
-
-
#
# Current default JVM home.
#
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/javapackages-5.0.0+git20180104.9367c8f6/man/abs2rel.txt
new/javapackages-5.2.0+git20180620.70fa2258/man/abs2rel.txt
--- old/javapackages-5.0.0+git20180104.9367c8f6/man/abs2rel.txt 2018-01-04
14:06:42.000000000 +0100
+++ new/javapackages-5.2.0+git20180620.70fa2258/man/abs2rel.txt 2018-06-20
12:13:47.000000000 +0200
@@ -30,5 +30,5 @@
REPORTING BUGS
--------------
-Bugs should be reported through Java Pacakges Tools issue tracker at
+Bugs should be reported through Java Packages Tools issue tracker at
Github: https://github.com/fedora-java/javapackages/issues.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/javapackages-5.0.0+git20180104.9367c8f6/man/build-classpath.txt
new/javapackages-5.2.0+git20180620.70fa2258/man/build-classpath.txt
--- old/javapackages-5.0.0+git20180104.9367c8f6/man/build-classpath.txt
2018-01-04 14:06:42.000000000 +0100
+++ new/javapackages-5.2.0+git20180620.70fa2258/man/build-classpath.txt
2018-06-20 12:13:47.000000000 +0200
@@ -46,7 +46,7 @@
REPORTING BUGS
--------------
-Bugs should be reported through Java Pacakges Tools issue tracker at
+Bugs should be reported through Java Packages Tools issue tracker at
Github: https://github.com/fedora-java/javapackages/issues.
SEE ALSO
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/javapackages-5.0.0+git20180104.9367c8f6/man/build-jar-repository.txt
new/javapackages-5.2.0+git20180620.70fa2258/man/build-jar-repository.txt
--- old/javapackages-5.0.0+git20180104.9367c8f6/man/build-jar-repository.txt
2018-01-04 14:06:42.000000000 +0100
+++ new/javapackages-5.2.0+git20180620.70fa2258/man/build-jar-repository.txt
2018-06-20 12:13:47.000000000 +0200
@@ -65,7 +65,7 @@
REPORTING BUGS
--------------
-Bugs should be reported through Java Pacakges Tools issue tracker at
+Bugs should be reported through Java Packages Tools issue tracker at
Github: https://github.com/fedora-java/javapackages/issues.
SEE ALSO
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/javapackages-5.0.0+git20180104.9367c8f6/man/find-jar.txt
new/javapackages-5.2.0+git20180620.70fa2258/man/find-jar.txt
--- old/javapackages-5.0.0+git20180104.9367c8f6/man/find-jar.txt
2018-01-04 14:06:42.000000000 +0100
+++ new/javapackages-5.2.0+git20180620.70fa2258/man/find-jar.txt
2018-06-20 12:13:47.000000000 +0200
@@ -38,7 +38,7 @@
REPORTING BUGS
--------------
-Bugs should be reported through Java Pacakges Tools issue tracker at
+Bugs should be reported through Java Packages Tools issue tracker at
Github: https://github.com/fedora-java/javapackages/issues.
SEE ALSO
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/javapackages-5.0.0+git20180104.9367c8f6/man/gradle_build.txt
new/javapackages-5.2.0+git20180620.70fa2258/man/gradle_build.txt
--- old/javapackages-5.0.0+git20180104.9367c8f6/man/gradle_build.txt
2018-01-04 14:06:42.000000000 +0100
+++ new/javapackages-5.2.0+git20180620.70fa2258/man/gradle_build.txt
2018-06-20 12:13:47.000000000 +0200
@@ -74,7 +74,7 @@
REPORTING BUGS
--------------
-Bugs should be reported through Java Pacakges Tools issue tracker at
+Bugs should be reported through Java Packages Tools issue tracker at
Github: https://github.com/fedora-java/javapackages/issues.
SEE ALSO
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/javapackages-5.0.0+git20180104.9367c8f6/man/mvn_alias.txt
new/javapackages-5.2.0+git20180620.70fa2258/man/mvn_alias.txt
--- old/javapackages-5.0.0+git20180104.9367c8f6/man/mvn_alias.txt
2018-01-04 14:06:42.000000000 +0100
+++ new/javapackages-5.2.0+git20180620.70fa2258/man/mvn_alias.txt
2018-06-20 12:13:47.000000000 +0200
@@ -51,7 +51,7 @@
REPORTING BUGS
--------------
-Bugs should be reported through Java Pacakges Tools issue tracker at
+Bugs should be reported through Java Packages Tools issue tracker at
Github: https://github.com/fedora-java/javapackages/issues.
SEE ALSO
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/javapackages-5.0.0+git20180104.9367c8f6/man/mvn_artifact.txt
new/javapackages-5.2.0+git20180620.70fa2258/man/mvn_artifact.txt
--- old/javapackages-5.0.0+git20180104.9367c8f6/man/mvn_artifact.txt
2018-01-04 14:06:42.000000000 +0100
+++ new/javapackages-5.2.0+git20180620.70fa2258/man/mvn_artifact.txt
2018-06-20 12:13:47.000000000 +0200
@@ -54,7 +54,7 @@
REPORTING BUGS
--------------
-Bugs should be reported through Java Pacakges Tools issue tracker at
+Bugs should be reported through Java Packages Tools issue tracker at
Github: https://github.com/fedora-java/javapackages/issues.
SEE ALSO
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/javapackages-5.0.0+git20180104.9367c8f6/man/mvn_build.txt
new/javapackages-5.2.0+git20180620.70fa2258/man/mvn_build.txt
--- old/javapackages-5.0.0+git20180104.9367c8f6/man/mvn_build.txt
2018-01-04 14:06:42.000000000 +0100
+++ new/javapackages-5.2.0+git20180620.70fa2258/man/mvn_build.txt
2018-06-20 12:13:47.000000000 +0200
@@ -80,7 +80,7 @@
REPORTING BUGS
--------------
-Bugs should be reported through Java Pacakges Tools issue tracker at
+Bugs should be reported through Java Packages Tools issue tracker at
Github: https://github.com/fedora-java/javapackages/issues.
SEE ALSO
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/javapackages-5.0.0+git20180104.9367c8f6/man/mvn_compat_version.txt
new/javapackages-5.2.0+git20180620.70fa2258/man/mvn_compat_version.txt
--- old/javapackages-5.0.0+git20180104.9367c8f6/man/mvn_compat_version.txt
2018-01-04 14:06:42.000000000 +0100
+++ new/javapackages-5.2.0+git20180620.70fa2258/man/mvn_compat_version.txt
2018-06-20 12:13:47.000000000 +0200
@@ -46,7 +46,7 @@
REPORTING BUGS
--------------
-Bugs should be reported through Java Pacakges Tools issue tracker at
+Bugs should be reported through Java Packages Tools issue tracker at
Github: https://github.com/fedora-java/javapackages/issues.
SEE ALSO
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/javapackages-5.0.0+git20180104.9367c8f6/man/mvn_config.txt
new/javapackages-5.2.0+git20180620.70fa2258/man/mvn_config.txt
--- old/javapackages-5.0.0+git20180104.9367c8f6/man/mvn_config.txt
2018-01-04 14:06:42.000000000 +0100
+++ new/javapackages-5.2.0+git20180620.70fa2258/man/mvn_config.txt
2018-06-20 12:13:47.000000000 +0200
@@ -37,7 +37,7 @@
REPORTING BUGS
--------------
-Bugs should be reported through Java Pacakges Tools issue tracker at
+Bugs should be reported through Java Packages Tools issue tracker at
Github: https://github.com/fedora-java/javapackages/issues.
SEE ALSO
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/javapackages-5.0.0+git20180104.9367c8f6/man/mvn_file.txt
new/javapackages-5.2.0+git20180620.70fa2258/man/mvn_file.txt
--- old/javapackages-5.0.0+git20180104.9367c8f6/man/mvn_file.txt
2018-01-04 14:06:42.000000000 +0100
+++ new/javapackages-5.2.0+git20180620.70fa2258/man/mvn_file.txt
2018-06-20 12:13:47.000000000 +0200
@@ -59,7 +59,7 @@
REPORTING BUGS
--------------
-Bugs should be reported through Java Pacakges Tools issue tracker at
+Bugs should be reported through Java Packages Tools issue tracker at
Github: https://github.com/fedora-java/javapackages/issues.
SEE ALSO
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/javapackages-5.0.0+git20180104.9367c8f6/man/mvn_install.txt
new/javapackages-5.2.0+git20180620.70fa2258/man/mvn_install.txt
--- old/javapackages-5.0.0+git20180104.9367c8f6/man/mvn_install.txt
2018-01-04 14:06:42.000000000 +0100
+++ new/javapackages-5.2.0+git20180620.70fa2258/man/mvn_install.txt
2018-06-20 12:13:47.000000000 +0200
@@ -44,7 +44,7 @@
REPORTING BUGS
--------------
-Bugs should be reported through Java Pacakges Tools issue tracker at
+Bugs should be reported through Java Packages Tools issue tracker at
Github: https://github.com/fedora-java/javapackages/issues.
SEE ALSO
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/javapackages-5.0.0+git20180104.9367c8f6/man/mvn_package.txt
new/javapackages-5.2.0+git20180620.70fa2258/man/mvn_package.txt
--- old/javapackages-5.0.0+git20180104.9367c8f6/man/mvn_package.txt
2018-01-04 14:06:42.000000000 +0100
+++ new/javapackages-5.2.0+git20180620.70fa2258/man/mvn_package.txt
2018-06-20 12:13:47.000000000 +0200
@@ -50,7 +50,7 @@
REPORTING BUGS
--------------
-Bugs should be reported through Java Pacakges Tools issue tracker at
+Bugs should be reported through Java Packages Tools issue tracker at
Github: https://github.com/fedora-java/javapackages/issues.
SEE ALSO
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/javapackages-5.0.0+git20180104.9367c8f6/man/pom_add_dep.txt
new/javapackages-5.2.0+git20180620.70fa2258/man/pom_add_dep.txt
--- old/javapackages-5.0.0+git20180104.9367c8f6/man/pom_add_dep.txt
2018-01-04 14:06:42.000000000 +0100
+++ new/javapackages-5.2.0+git20180620.70fa2258/man/pom_add_dep.txt
2018-06-20 12:13:47.000000000 +0200
@@ -61,7 +61,7 @@
REPORTING BUGS
--------------
-Bugs should be reported through Java Pacakges Tools issue tracker at
+Bugs should be reported through Java Packages Tools issue tracker at
Github: https://github.com/fedora-java/javapackages/issues.
SEE ALSO
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/javapackages-5.0.0+git20180104.9367c8f6/man/pom_add_parent.txt
new/javapackages-5.2.0+git20180620.70fa2258/man/pom_add_parent.txt
--- old/javapackages-5.0.0+git20180104.9367c8f6/man/pom_add_parent.txt
2018-01-04 14:06:42.000000000 +0100
+++ new/javapackages-5.2.0+git20180620.70fa2258/man/pom_add_parent.txt
2018-06-20 12:13:47.000000000 +0200
@@ -37,7 +37,7 @@
REPORTING BUGS
--------------
-Bugs should be reported through Java Pacakges Tools issue tracker at
+Bugs should be reported through Java Packages Tools issue tracker at
Github: https://github.com/fedora-java/javapackages/issues.
SEE ALSO
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/javapackages-5.0.0+git20180104.9367c8f6/man/pom_add_plugin.txt
new/javapackages-5.2.0+git20180620.70fa2258/man/pom_add_plugin.txt
--- old/javapackages-5.0.0+git20180104.9367c8f6/man/pom_add_plugin.txt
2018-01-04 14:06:42.000000000 +0100
+++ new/javapackages-5.2.0+git20180620.70fa2258/man/pom_add_plugin.txt
2018-06-20 12:13:47.000000000 +0200
@@ -47,7 +47,7 @@
REPORTING BUGS
--------------
-Bugs should be reported through Java Pacakges Tools issue tracker at
+Bugs should be reported through Java Packages Tools issue tracker at
Github: https://github.com/fedora-java/javapackages/issues.
SEE ALSO
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/javapackages-5.0.0+git20180104.9367c8f6/man/pom_change_dep.txt
new/javapackages-5.2.0+git20180620.70fa2258/man/pom_change_dep.txt
--- old/javapackages-5.0.0+git20180104.9367c8f6/man/pom_change_dep.txt
2018-01-04 14:06:42.000000000 +0100
+++ new/javapackages-5.2.0+git20180620.70fa2258/man/pom_change_dep.txt
2018-06-20 12:13:47.000000000 +0200
@@ -60,7 +60,7 @@
REPORTING BUGS
--------------
-Bugs should be reported through Java Pacakges Tools issue tracker at
+Bugs should be reported through Java Packages Tools issue tracker at
Github: https://github.com/fedora-java/javapackages/issues.
SEE ALSO
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/javapackages-5.0.0+git20180104.9367c8f6/man/pom_disable_module.txt
new/javapackages-5.2.0+git20180620.70fa2258/man/pom_disable_module.txt
--- old/javapackages-5.0.0+git20180104.9367c8f6/man/pom_disable_module.txt
2018-01-04 14:06:42.000000000 +0100
+++ new/javapackages-5.2.0+git20180620.70fa2258/man/pom_disable_module.txt
2018-06-20 12:13:47.000000000 +0200
@@ -36,7 +36,7 @@
REPORTING BUGS
--------------
-Bugs should be reported through Java Pacakges Tools issue tracker at
+Bugs should be reported through Java Packages Tools issue tracker at
Github: https://github.com/fedora-java/javapackages/issues.
SEE ALSO
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/javapackages-5.0.0+git20180104.9367c8f6/man/pom_remove_dep.txt
new/javapackages-5.2.0+git20180620.70fa2258/man/pom_remove_dep.txt
--- old/javapackages-5.0.0+git20180104.9367c8f6/man/pom_remove_dep.txt
2018-01-04 14:06:42.000000000 +0100
+++ new/javapackages-5.2.0+git20180620.70fa2258/man/pom_remove_dep.txt
2018-06-20 12:13:47.000000000 +0200
@@ -66,7 +66,7 @@
REPORTING BUGS
--------------
-Bugs should be reported through Java Pacakges Tools issue tracker at
+Bugs should be reported through Java Packages Tools issue tracker at
Github: https://github.com/fedora-java/javapackages/issues.
SEE ALSO
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/javapackages-5.0.0+git20180104.9367c8f6/man/pom_remove_parent.txt
new/javapackages-5.2.0+git20180620.70fa2258/man/pom_remove_parent.txt
--- old/javapackages-5.0.0+git20180104.9367c8f6/man/pom_remove_parent.txt
2018-01-04 14:06:42.000000000 +0100
+++ new/javapackages-5.2.0+git20180620.70fa2258/man/pom_remove_parent.txt
2018-06-20 12:13:47.000000000 +0200
@@ -33,7 +33,7 @@
REPORTING BUGS
--------------
-Bugs should be reported through Java Pacakges Tools issue tracker at
+Bugs should be reported through Java Packages Tools issue tracker at
Github: https://github.com/fedora-java/javapackages/issues.
SEE ALSO
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/javapackages-5.0.0+git20180104.9367c8f6/man/pom_remove_plugin.txt
new/javapackages-5.2.0+git20180620.70fa2258/man/pom_remove_plugin.txt
--- old/javapackages-5.0.0+git20180104.9367c8f6/man/pom_remove_plugin.txt
2018-01-04 14:06:42.000000000 +0100
+++ new/javapackages-5.2.0+git20180620.70fa2258/man/pom_remove_plugin.txt
2018-06-20 12:13:47.000000000 +0200
@@ -50,7 +50,7 @@
REPORTING BUGS
--------------
-Bugs should be reported through Java Pacakges Tools issue tracker at
+Bugs should be reported through Java Packages Tools issue tracker at
Github: https://github.com/fedora-java/javapackages/issues.
SEE ALSO
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/javapackages-5.0.0+git20180104.9367c8f6/man/pom_set_parent.txt
new/javapackages-5.2.0+git20180620.70fa2258/man/pom_set_parent.txt
--- old/javapackages-5.0.0+git20180104.9367c8f6/man/pom_set_parent.txt
2018-01-04 14:06:42.000000000 +0100
+++ new/javapackages-5.2.0+git20180620.70fa2258/man/pom_set_parent.txt
2018-06-20 12:13:47.000000000 +0200
@@ -39,7 +39,7 @@
REPORTING BUGS
--------------
-Bugs should be reported through Java Pacakges Tools issue tracker at
+Bugs should be reported through Java Packages Tools issue tracker at
Github: https://github.com/fedora-java/javapackages/issues.
SEE ALSO
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/javapackages-5.0.0+git20180104.9367c8f6/man/pom_xpath_disable.txt
new/javapackages-5.2.0+git20180620.70fa2258/man/pom_xpath_disable.txt
--- old/javapackages-5.0.0+git20180104.9367c8f6/man/pom_xpath_disable.txt
2018-01-04 14:06:42.000000000 +0100
+++ new/javapackages-5.2.0+git20180620.70fa2258/man/pom_xpath_disable.txt
2018-06-20 12:13:47.000000000 +0200
@@ -46,7 +46,7 @@
REPORTING BUGS
--------------
-Bugs should be reported through Java Pacakges Tools issue tracker at
+Bugs should be reported through Java Packages Tools issue tracker at
Github: https://github.com/fedora-java/javapackages/issues.
SEE ALSO
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/javapackages-5.0.0+git20180104.9367c8f6/man/pom_xpath_inject.txt
new/javapackages-5.2.0+git20180620.70fa2258/man/pom_xpath_inject.txt
--- old/javapackages-5.0.0+git20180104.9367c8f6/man/pom_xpath_inject.txt
2018-01-04 14:06:42.000000000 +0100
+++ new/javapackages-5.2.0+git20180620.70fa2258/man/pom_xpath_inject.txt
2018-06-20 12:13:47.000000000 +0200
@@ -54,7 +54,7 @@
REPORTING BUGS
--------------
-Bugs should be reported through Java Pacakges Tools issue tracker at
+Bugs should be reported through Java Packages Tools issue tracker at
Github: https://github.com/fedora-java/javapackages/issues.
SEE ALSO
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/javapackages-5.0.0+git20180104.9367c8f6/man/pom_xpath_remove.txt
new/javapackages-5.2.0+git20180620.70fa2258/man/pom_xpath_remove.txt
--- old/javapackages-5.0.0+git20180104.9367c8f6/man/pom_xpath_remove.txt
2018-01-04 14:06:42.000000000 +0100
+++ new/javapackages-5.2.0+git20180620.70fa2258/man/pom_xpath_remove.txt
2018-06-20 12:13:47.000000000 +0200
@@ -69,7 +69,7 @@
REPORTING BUGS
--------------
-Bugs should be reported through Java Pacakges Tools issue tracker at
+Bugs should be reported through Java Packages Tools issue tracker at
Github: https://github.com/fedora-java/javapackages/issues.
SEE ALSO
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/javapackages-5.0.0+git20180104.9367c8f6/man/pom_xpath_replace.txt
new/javapackages-5.2.0+git20180620.70fa2258/man/pom_xpath_replace.txt
--- old/javapackages-5.0.0+git20180104.9367c8f6/man/pom_xpath_replace.txt
2018-01-04 14:06:42.000000000 +0100
+++ new/javapackages-5.2.0+git20180620.70fa2258/man/pom_xpath_replace.txt
2018-06-20 12:13:47.000000000 +0200
@@ -58,7 +58,7 @@
REPORTING BUGS
--------------
-Bugs should be reported through Java Pacakges Tools issue tracker at
+Bugs should be reported through Java Packages Tools issue tracker at
Github: https://github.com/fedora-java/javapackages/issues.
SEE ALSO
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/javapackages-5.0.0+git20180104.9367c8f6/man/pom_xpath_set.txt
new/javapackages-5.2.0+git20180620.70fa2258/man/pom_xpath_set.txt
--- old/javapackages-5.0.0+git20180104.9367c8f6/man/pom_xpath_set.txt
2018-01-04 14:06:42.000000000 +0100
+++ new/javapackages-5.2.0+git20180620.70fa2258/man/pom_xpath_set.txt
2018-06-20 12:13:47.000000000 +0200
@@ -47,7 +47,7 @@
REPORTING BUGS
--------------
-Bugs should be reported through Java Pacakges Tools issue tracker at
+Bugs should be reported through Java Packages Tools issue tracker at
Github: https://github.com/fedora-java/javapackages/issues.
SEE ALSO
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/javapackages-5.0.0+git20180104.9367c8f6/man/rebuild-jar-repository.txt
new/javapackages-5.2.0+git20180620.70fa2258/man/rebuild-jar-repository.txt
--- old/javapackages-5.0.0+git20180104.9367c8f6/man/rebuild-jar-repository.txt
2018-01-04 14:06:42.000000000 +0100
+++ new/javapackages-5.2.0+git20180620.70fa2258/man/rebuild-jar-repository.txt
2018-06-20 12:13:47.000000000 +0200
@@ -53,7 +53,7 @@
REPORTING BUGS
--------------
-Bugs should be reported through Java Pacakges Tools issue tracker at
+Bugs should be reported through Java Packages Tools issue tracker at
Github: https://github.com/fedora-java/javapackages/issues.
SEE ALSO
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/javapackages-5.0.0+git20180104.9367c8f6/man/shade-jar.txt
new/javapackages-5.2.0+git20180620.70fa2258/man/shade-jar.txt
--- old/javapackages-5.0.0+git20180104.9367c8f6/man/shade-jar.txt
2018-01-04 14:06:42.000000000 +0100
+++ new/javapackages-5.2.0+git20180620.70fa2258/man/shade-jar.txt
2018-06-20 12:13:47.000000000 +0200
@@ -40,5 +40,5 @@
REPORTING BUGS
--------------
-Bugs should be reported through Java Pacakges Tools issue tracker at
+Bugs should be reported through Java Packages Tools issue tracker at
Github: https://github.com/fedora-java/javapackages/issues.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/javapackages-5.0.0+git20180104.9367c8f6/test/pm_request_test.py
new/javapackages-5.2.0+git20180620.70fa2258/test/pm_request_test.py
--- old/javapackages-5.0.0+git20180104.9367c8f6/test/pm_request_test.py
2018-01-04 14:06:42.000000000 +0100
+++ new/javapackages-5.2.0+git20180620.70fa2258/test/pm_request_test.py
2018-06-20 12:13:47.000000000 +0200
@@ -19,7 +19,7 @@
def test_ok(self):
(out, err, proc) = call_script(self.scriptpath,
['maven', 'junit:junit'],
- extra_env=self.env, async=True)
+ extra_env=self.env, wait=False)
conn, _ = self.sock.accept()
request = conn.makefile().readline().rstrip()
self.assertEqual(request, "install 'mvn(junit:junit)'")
@@ -31,7 +31,7 @@
def test_nok(self):
(out, err, proc) = call_script(self.scriptpath,
['maven', 'junit:junit'],
- extra_env=self.env, async=True)
+ extra_env=self.env, wait=False)
conn, _ = self.sock.accept()
request = conn.makefile().readline().rstrip()
self.assertEqual(request, "install 'mvn(junit:junit)'")
@@ -43,7 +43,7 @@
def test_jar(self):
(out, err, proc) = call_script(self.scriptpath,
['maven', 'gid:aid:jar::'],
- extra_env=self.env, async=True)
+ extra_env=self.env, wait=False)
conn, _ = self.sock.accept()
request = conn.makefile().readline().rstrip()
self.assertEqual(request, "install 'mvn(gid:aid)'")
@@ -55,7 +55,7 @@
def test_full_coords(self):
(out, err, proc) = call_script(self.scriptpath,
['maven', 'gid:aid:ext:cla:ver'],
- extra_env=self.env, async=True)
+ extra_env=self.env, wait=False)
conn, _ = self.sock.accept()
request = conn.makefile().readline().rstrip()
self.assertEqual(request, "install 'mvn(gid:aid:ext:cla:ver)'")
@@ -67,7 +67,7 @@
def test_connection_error(self):
(out, err, proc) = call_script(self.scriptpath,
['maven', 'junit:junit'],
- extra_env=self.env, async=True)
+ extra_env=self.env, wait=False)
conn, _ = self.sock.accept()
conn.close()
ret = proc.wait()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/javapackages-5.0.0+git20180104.9367c8f6/test/test_common.py
new/javapackages-5.2.0+git20180620.70fa2258/test/test_common.py
--- old/javapackages-5.0.0+git20180104.9367c8f6/test/test_common.py
2018-01-04 14:06:42.000000000 +0100
+++ new/javapackages-5.2.0+git20180620.70fa2258/test/test_common.py
2018-06-20 12:13:47.000000000 +0200
@@ -24,7 +24,7 @@
SCRIPT_ENV[var] = os.environ[var]
-def call_script(name, args, stdin=None, extra_env={}, async=False):
+def call_script(name, args, stdin=None, extra_env={}, wait=True):
with open("tmpout", 'w') as outfile:
with open("tmperr", 'w') as errfile:
procargs = [sys.executable, name]
@@ -36,7 +36,7 @@
env=env,
stdin=subprocess.PIPE,
universal_newlines=True)
- if async:
+ if not wait:
return (outfile, errfile, proc)
proc.communicate(stdin)
ret = proc.wait()
++++++ python-optional.patch ++++++
--- /var/tmp/diff_new_pack.fUmF3M/_old 2018-07-26 10:16:50.087766641 +0200
+++ /var/tmp/diff_new_pack.fUmF3M/_new 2018-07-26 10:16:50.087766641 +0200
@@ -1,18 +1,18 @@
-Index: javapackages-5.0.0+git20180104.9367c8f6/build
+Index: javapackages-5.2.0+git20180620.70fa2258/build
===================================================================
---- javapackages-5.0.0+git20180104.9367c8f6.orig/build
-+++ javapackages-5.0.0+git20180104.9367c8f6/build
+--- javapackages-5.2.0+git20180620.70fa2258.orig/build
++++ javapackages-5.2.0+git20180620.70fa2258/build
@@ -117,5 +117,3 @@ manpage build-classpath
manpage build-jar-repository
manpage rebuild-jar-repository
manpage shade-jar
-
-(cd ./python && "${pyinterpreter}" setup.py build)
-Index: javapackages-5.0.0+git20180104.9367c8f6/install
+Index: javapackages-5.2.0+git20180620.70fa2258/install
===================================================================
---- javapackages-5.0.0+git20180104.9367c8f6.orig/install
-+++ javapackages-5.0.0+git20180104.9367c8f6/install
-@@ -242,8 +242,3 @@ exec >files-gradle
+--- javapackages-5.2.0+git20180620.70fa2258.orig/install
++++ javapackages-5.2.0+git20180620.70fa2258/install
+@@ -253,8 +253,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,10 +21,10 @@
-(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.0.0+git20180104.9367c8f6/configure-base.sh
+Index: javapackages-5.2.0+git20180620.70fa2258/configure-base.sh
===================================================================
---- javapackages-5.0.0+git20180104.9367c8f6.orig/configure-base.sh
-+++ javapackages-5.0.0+git20180104.9367c8f6/configure-base.sh
+--- javapackages-5.2.0+git20180620.70fa2258.orig/configure-base.sh
++++ javapackages-5.2.0+git20180620.70fa2258/configure-base.sh
@@ -57,7 +57,6 @@ test -z "${rpmconfigdir}" && rpmconfigdi
test -z "${rpmmacrodir}" && rpmmacrodir="${rpmconfigdir}/macros.d"
@@ -32,4 +32,4 @@
-test -z "${pyinterpreter}" && pyinterpreter=$(which 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.jpackage)
+ eval $(sed -n 's/^%_\('"$vars_re"'\)\
*\(.*\)$/\1="\2"/;T;s/%{_\(.*}\)/${\1/;p'
macros.d/macros.javapackages-filesystem)
++++++ suse-use-libdir.patch ++++++
--- /var/tmp/diff_new_pack.fUmF3M/_old 2018-07-26 10:16:50.095766655 +0200
+++ /var/tmp/diff_new_pack.fUmF3M/_new 2018-07-26 10:16:50.099766662 +0200
@@ -6,10 +6,30 @@
macros.d/macros.jpackage | 12 ++++++------
2 files changed, 8 insertions(+), 6 deletions(-)
-Index: javapackages-5.0.0+git20180104.9367c8f6/macros.d/macros.jpackage
+Index: javapackages-5.2.0+git20180620.70fa2258/configure-base.sh
===================================================================
---- javapackages-5.0.0+git20180104.9367c8f6.orig/macros.d/macros.jpackage
-+++ javapackages-5.0.0+git20180104.9367c8f6/macros.d/macros.jpackage
+--- javapackages-5.2.0+git20180620.70fa2258.orig/configure-base.sh
++++ javapackages-5.2.0+git20180620.70fa2258/configure-base.sh
+@@ -14,6 +14,7 @@ sysconfdir
+ root_sysconfdir
+ rpmconfigdir
+ rpmmacrodir
++libdir
+
+ m2home
+
+@@ -51,6 +52,7 @@ test -z "${mandir}" && mandir="${datadir
+ test -z "${rundir}" && rundir="${localstatedir}/run"
+ test -z "${sysconfdir}" && sysconfdir="${prefix}/etc"
+ test -z "${root_sysconfdir}" && root_sysconfdir="${prefix}/etc"
++test -z "${libdir}" && rpmconfigdir="${prefix}/lib/"
+ test -z "${rpmconfigdir}" && rpmconfigdir="${prefix}/lib/rpm"
+ test -z "${rpmmacrodir}" && rpmmacrodir="${rpmconfigdir}/macros.d"
+
+Index:
javapackages-5.2.0+git20180620.70fa2258/macros.d/macros.javapackages-filesystem
+===================================================================
+---
javapackages-5.2.0+git20180620.70fa2258.orig/macros.d/macros.javapackages-filesystem
++++
javapackages-5.2.0+git20180620.70fa2258/macros.d/macros.javapackages-filesystem
@@ -13,17 +13,17 @@
#
# Root directory where all Java VMs/SDK/JREs are installed.
@@ -49,23 +69,3 @@
#
# Root directory where all javadoc is installed. Also already in RH macros.
-Index: javapackages-5.0.0+git20180104.9367c8f6/configure-base.sh
-===================================================================
---- javapackages-5.0.0+git20180104.9367c8f6.orig/configure-base.sh
-+++ javapackages-5.0.0+git20180104.9367c8f6/configure-base.sh
-@@ -14,6 +14,7 @@ sysconfdir
- root_sysconfdir
- rpmconfigdir
- rpmmacrodir
-+libdir
-
- m2home
-
-@@ -51,6 +52,7 @@ test -z "${mandir}" && mandir="${datadir
- test -z "${rundir}" && rundir="${localstatedir}/run"
- test -z "${sysconfdir}" && sysconfdir="${prefix}/etc"
- test -z "${root_sysconfdir}" && root_sysconfdir="${prefix}/etc"
-+test -z "${libdir}" && rpmconfigdir="${prefix}/lib/"
- test -z "${rpmconfigdir}" && rpmconfigdir="${prefix}/lib/rpm"
- test -z "${rpmmacrodir}" && rpmmacrodir="${rpmconfigdir}/macros.d"
-
