Hello community,
here is the log from the commit of package javapackages-tools for
openSUSE:Factory checked in at 2018-01-30 15:41:50
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/javapackages-tools (Old)
and /work/SRC/openSUSE:Factory/.javapackages-tools.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "javapackages-tools"
Tue Jan 30 15:41:50 2018 rev:15 rq:570501 version:5.0.0+git20180104.9367c8f6
Changes:
--------
---
/work/SRC/openSUSE:Factory/javapackages-tools/javapackages-tools-extras.changes
2017-05-31 13:32:26.337553435 +0200
+++
/work/SRC/openSUSE:Factory/.javapackages-tools.new/javapackages-tools-extras.changes
2018-01-30 15:41:51.437737609 +0100
@@ -1,0 +2,19 @@
+Mon Jan 22 09:31:20 UTC 2018 - [email protected]
+
+- Update to version 5.0.0+git20180104.9367c8f6:
+ * [java-functions] Avoid colons in jar names
+ * Workaround for SCL enable scripts not working with -e
+ * Second argument to pom_xpath_inject is mandatory
+ * [mvn_artifact] Provide more helpful error messages
+ * Fix traceback on corrupt zipfile
+ * [test] Add reproducer for rhbz#1481005
+ * [spec] Fix default JRE path
+ * [readme] Fix typo
+ * Add initial content to README.md (#21)
+ * Decouple JAVA_HOME setting from java command alternatives
+- Rebase patches:
+ * python-optional.patch
+ * suse-use-libdir.patch
+- Drop merged patch fix-abs2rel.patch
+
+-------------------------------------------------------------------
javapackages-tools.changes: same change
Old:
----
fix-abs2rel.patch
javapackages-4.7.0+git20170331.ef4057e7.tar.xz
New:
----
javapackages-5.0.0+git20180104.9367c8f6.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ javapackages-tools-extras.spec ++++++
--- /var/tmp/diff_new_pack.xQfWou/_old 2018-01-30 15:41:52.677679721 +0100
+++ /var/tmp/diff_new_pack.xQfWou/_new 2018-01-30 15:41:52.681679535 +0100
@@ -1,7 +1,7 @@
#
# spec file for package javapackages-tools-extras
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,7 +18,7 @@
%bcond_without python
Name: javapackages-tools-extras
-Version: 4.7.0+git20170331.ef4057e7
+Version: 5.0.0+git20180104.9367c8f6
Release: 0
Summary: Macros and scripts for Java packaging support
License: BSD-3-Clause
@@ -31,8 +31,6 @@
Patch0: suse-use-libdir.patch
#PATCH-FIX-SUSE: allow building without python to reduce depgraph
Patch1: python-optional.patch
-#PATCH-FIX-UPSTREAM: use proper expansion for shebang
-Patch2: fix-abs2rel.patch
BuildRequires: asciidoc
BuildRequires: fdupes
BuildRequires: rpm
@@ -111,7 +109,7 @@
%build
%configure \
%if %{with python}
- --pyinterpreter=/usr/bin/python3
+ --pyinterpreter=%{_bindir}/python3
%else
--pyinterpreter=%{nil}
%endif
@@ -144,6 +142,7 @@
%{_bindir}/shade-jar
%{_sysconfdir}/java/font.properties
%{_sysconfdir}/java/java.conf
+%{_sysconfdir}/java/eclipse.conf
%{_datadir}/java-utils/java-functions
%{_datadir}/java-utils/java-wrapper
%{_datadir}/java-utils/scl-enable
@@ -171,26 +170,20 @@
%if !%{with python}
%files -f files-common
-%defattr(-,root,root,-)
%doc LICENSE
%else
%files -n javapackages-local -f files-local
-%defattr(-,root,root,-)
%dir %{_datadir}/java-utils
%files -n maven-local -f files-maven
-%defattr(-,root,root,-)
%files -n gradle-local -f files-gradle
-%defattr(-,root,root)
%dir %{_datadir}/gradle-local
%files -n ivy-local -f files-ivy
-%defattr(-,root,root,-)
%dir %{_sysconfdir}/ant.d
%files -n python3-javapackages
-%defattr(-,root,root,-)
%doc LICENSE
%{python3_sitelib}/javapackages*
%endif
++++++ javapackages-tools.spec ++++++
--- /var/tmp/diff_new_pack.xQfWou/_old 2018-01-30 15:41:52.697678787 +0100
+++ /var/tmp/diff_new_pack.xQfWou/_new 2018-01-30 15:41:52.701678601 +0100
@@ -1,7 +1,7 @@
#
# spec file for package javapackages-tools
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,7 +18,7 @@
%bcond_with python
Name: javapackages-tools
-Version: 4.7.0+git20170331.ef4057e7
+Version: 5.0.0+git20180104.9367c8f6
Release: 0
Summary: Macros and scripts for Java packaging support
License: BSD-3-Clause
@@ -31,8 +31,6 @@
Patch0: suse-use-libdir.patch
#PATCH-FIX-SUSE: allow building without python to reduce depgraph
Patch1: python-optional.patch
-#PATCH-FIX-UPSTREAM: use proper expansion for shebang
-Patch2: fix-abs2rel.patch
BuildRequires: asciidoc
BuildRequires: fdupes
BuildRequires: rpm
@@ -111,7 +109,7 @@
%build
%configure \
%if %{with python}
- --pyinterpreter=/usr/bin/python3
+ --pyinterpreter=%{_bindir}/python3
%else
--pyinterpreter=%{nil}
%endif
@@ -144,6 +142,7 @@
%{_bindir}/shade-jar
%{_sysconfdir}/java/font.properties
%{_sysconfdir}/java/java.conf
+%{_sysconfdir}/java/eclipse.conf
%{_datadir}/java-utils/java-functions
%{_datadir}/java-utils/java-wrapper
%{_datadir}/java-utils/scl-enable
@@ -171,26 +170,20 @@
%if !%{with python}
%files -f files-common
-%defattr(-,root,root,-)
%doc LICENSE
%else
%files -n javapackages-local -f files-local
-%defattr(-,root,root,-)
%dir %{_datadir}/java-utils
%files -n maven-local -f files-maven
-%defattr(-,root,root,-)
%files -n gradle-local -f files-gradle
-%defattr(-,root,root)
%dir %{_datadir}/gradle-local
%files -n ivy-local -f files-ivy
-%defattr(-,root,root,-)
%dir %{_sysconfdir}/ant.d
%files -n python3-javapackages
-%defattr(-,root,root,-)
%doc LICENSE
%{python3_sitelib}/javapackages*
%endif
++++++ _service ++++++
--- /var/tmp/diff_new_pack.xQfWou/_old 2018-01-30 15:41:52.733677107 +0100
+++ /var/tmp/diff_new_pack.xQfWou/_new 2018-01-30 15:41:52.737676920 +0100
@@ -4,7 +4,7 @@
<param name="scm">git</param>
<param name="changesgenerate">enable</param>
<param name="filename">javapackages</param>
- <param name="versionformat">4.7.0+git%cd.%h</param>
+ <param name="versionformat">5.0.0+git%cd.%h</param>
</service>
<service mode="disabled" name="recompress">
<param name="file">*.tar</param>
++++++ javapackages-4.7.0+git20170331.ef4057e7.tar.xz ->
javapackages-5.0.0+git20180104.9367c8f6.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/javapackages-4.7.0+git20170331.ef4057e7/README.md
new/javapackages-5.0.0+git20180104.9367c8f6/README.md
--- old/javapackages-4.7.0+git20170331.ef4057e7/README.md 2017-03-31
05:34:20.000000000 +0200
+++ new/javapackages-5.0.0+git20180104.9367c8f6/README.md 2018-01-04
14:06:42.000000000 +0100
@@ -1 +1,22 @@
[](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.
+
+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.
+
+
+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.
+
+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
+Tools maintainers <[email protected]>.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/javapackages-4.7.0+git20170331.ef4057e7/bin/abs2rel
new/javapackages-5.0.0+git20180104.9367c8f6/bin/abs2rel
--- old/javapackages-4.7.0+git20170331.ef4057e7/bin/abs2rel 2017-03-31
05:34:20.000000000 +0200
+++ new/javapackages-5.0.0+git20180104.9367c8f6/bin/abs2rel 2018-01-04
14:06:42.000000000 +0100
@@ -1,4 +1,4 @@
-#!%{pyinterpreter}
+#!@{pyinterpreter}
# Copyright (c) 2017, Red Hat, Inc.
#
# All rights reserved.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/javapackages-4.7.0+git20170331.ef4057e7/bin/rebuild-jar-repository
new/javapackages-5.0.0+git20180104.9367c8f6/bin/rebuild-jar-repository
--- old/javapackages-4.7.0+git20170331.ef4057e7/bin/rebuild-jar-repository
2017-03-31 05:34:20.000000000 +0200
+++ new/javapackages-5.0.0+git20180104.9367c8f6/bin/rebuild-jar-repository
2018-01-04 14:06:42.000000000 +0100
@@ -59,7 +59,7 @@
set_jvm_dirs || exit 5
extension_list=$(find $repository -name '\[*\]*.jar' -not -type d | \
-sed 's+\]\[+/+g' | sed 's+.*\[++g' | sed 's+\].*++g' | sort | uniq)
+sed 's+\]\[+/+g' | sed 's+.*\[++g' | sed 's+\].*++g' | sed 's+@+:+g' | sort |
uniq)
rm -f $(find $repository -name '\[*\]*.jar' -not -type d)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/javapackages-4.7.0+git20170331.ef4057e7/build
new/javapackages-5.0.0+git20180104.9367c8f6/build
--- old/javapackages-4.7.0+git20170331.ef4057e7/build 2017-03-31
05:34:20.000000000 +0200
+++ new/javapackages-5.0.0+git20180104.9367c8f6/build 2018-01-04
14:06:42.000000000 +0100
@@ -37,6 +37,7 @@
exit 1
fi
. ./config.status
+. ./expand.sh
rm -rf target
mkdir target
@@ -48,38 +49,12 @@
(cd ./target && xmlto man --skip-validation "${1}.xml")
}
-expand()
-{
- local target
- if [[ -n "${2}" ]]; then
- target="${2}"
- else
- target=$(basename "${1}")
- fi
-
- sed \
- -e "s|@{scl}|${scl}|g" \
- -e "s|@{scl_root}|${scl_root}|g" \
- -e "s|@{scl_root_relative}|${scl_root_relative}|g" \
- -e "s|@{bindir}|${bindir}|g" \
- -e "s|@{datadir}|${datadir}|g" \
- -e "s|@{javaconfdir}|${javaconfdir}|g" \
- -e "s|@{javadir}|${javadir}|g" \
- -e "s|@{jnidir}|${jnidir}|g" \
- -e "s|@{jvmdir}|${jvmdir}|g" \
- -e "s|@{m2home}|${m2home}|g" \
- -e "s|@{prefix}|${prefix}|g" \
- -e "s|@{rundir}|${rundir}|g" \
- -e "s|@{sysconfdir}|${sysconfdir}|g" \
- -e "s|@{pyinterpreter}|${pyinterpreter}|g" \
- -e "s|@{abrtlibdir}|${abrtlibdir}|g" \
- "${1}" >target/"${target}"
-}
-
if [[ -n "${scl}" ]]; then
- expand configs/configuration-SCL.xml configuration.xml
- expand etc/javapackages-config-SCL.json javapackages-config.json
- expand etc/javapackages-metadata-SCL.xml javapackages-metadata.xml
+ expand configs/configuration-SCL.xml target/configuration.xml
+ expand etc/javapackages-config-SCL.json target/javapackages-config.json
+ expand etc/javapackages-metadata-SCL.xml target/javapackages-metadata.xml
+ sed
"s:macros\.d/macros\.jpackage:${rpmmacrodir}/macros.x-${scl}.jpackage:"
configure-base.sh > target/configure-base.sh
+ expand macros.d/macros.scl-java-template
else
cat configs/configuration.xml >target/configuration.xml
cat etc/javapackages-config.json >target/javapackages-config.json
@@ -100,6 +75,7 @@
expand bin/shade-jar
expand bin/xmvn-builddep
expand etc/java.conf
+expand etc/eclipse.conf
expand macros.d/macros.jpackage
expand macros.d/macros.fjava
expand java-utils/java-functions
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/javapackages-4.7.0+git20170331.ef4057e7/configure
new/javapackages-5.0.0+git20180104.9367c8f6/configure
--- old/javapackages-4.7.0+git20170331.ef4057e7/configure 2017-03-31
05:34:20.000000000 +0200
+++ new/javapackages-5.0.0+git20180104.9367c8f6/configure 2018-01-04
14:06:42.000000000 +0100
@@ -32,61 +32,6 @@
set -e
-vars="
-scl
-scl_root
-scl_root_relative
-
-bindir
-datadir
-localstatedir
-mandir
-prefix
-rundir
-sysconfdir
-rpmconfigdir
-
-m2home
-
-javaconfdir
-javadir
-javadocdir
-jnidir
-jvmcommondatadir
-jvmcommonlibdir
-jvmcommonsysconfdir
-jvmdatadir
-jvmdir
-jvmlibdir
-jvmprivdir
-jvmsysconfdir
-mavenpomdir
-ivyxmldir
-pyinterpreter
-abrtlibdir
-"
-
-vars_re=$(echo $vars | sed 's/ /\\|/g')
-
-eval $(for _; do echo "$_"; done |
- sed -n 's/^--\('"$vars_re"'\)=\(.*\)$/\1="\2"/;T;p')
-
-test -z "${prefix}" && prefix="/usr/local"
-test -z "${bindir}" && bindir="${prefix}/bin"
-test -z "${datadir}" && datadir="${prefix}/share"
-test -z "${localstatedir}" && localstatedir="${prefix}/var"
-test -z "${mandir}" && mandir="${datadir}/man"
-test -z "${rundir}" && rundir="${localstatedir}/run"
-test -z "${sysconfdir}" && sysconfdir="${prefix}/etc"
-test -z "${rpmconfigdir}" && rpmconfigdir="${prefix}/lib/rpm"
-
-test -z "${m2home}" && m2home="${datadir}/xmvn"
-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)
-
-test -z "${scl_root_relative}" -a -n "${scl_root}" && scl_root_relative=$(sed
"s:^/*::" <<<"${scl_root}")
+. ./configure-base.sh
set | sed -n 's/^\('"$vars_re"'\)=/&/;T;p' >config.status
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/javapackages-4.7.0+git20170331.ef4057e7/configure-base.sh
new/javapackages-5.0.0+git20180104.9367c8f6/configure-base.sh
--- old/javapackages-4.7.0+git20170331.ef4057e7/configure-base.sh
1970-01-01 01:00:00.000000000 +0100
+++ new/javapackages-5.0.0+git20180104.9367c8f6/configure-base.sh
2018-01-04 14:06:42.000000000 +0100
@@ -0,0 +1,68 @@
+vars="
+scl
+scl_root
+scl_root_relative
+scl_suffix
+
+bindir
+datadir
+localstatedir
+mandir
+prefix
+rundir
+sysconfdir
+root_sysconfdir
+rpmconfigdir
+rpmmacrodir
+
+m2home
+
+default_jdk
+default_jre
+
+javaconfdir
+javadir
+javadocdir
+jnidir
+jvmcommondatadir
+jvmcommonlibdir
+jvmcommonsysconfdir
+jvmdatadir
+jvmdir
+jvmlibdir
+jvmprivdir
+jvmsysconfdir
+mavenpomdir
+ivyxmldir
+pyinterpreter
+abrtlibdir
+"
+
+vars_re=$(echo $vars | sed 's/ /\\|/g')
+
+eval $(for _; do echo "$_"; done |
+ sed -n 's/^--\('"$vars_re"'\)=\(.*\)$/\1="\2"/;T;p')
+
+test -z "${prefix}" && prefix="/usr/local"
+test -z "${bindir}" && bindir="${prefix}/bin"
+test -z "${datadir}" && datadir="${prefix}/share"
+test -z "${localstatedir}" && localstatedir="${prefix}/var"
+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"
+test -z "${rpmconfigdir}" && rpmconfigdir="${prefix}/lib/rpm"
+test -z "${rpmmacrodir}" && rpmmacrodir="${rpmconfigdir}/macros.d"
+
+test -z "${m2home}" && m2home="${datadir}/xmvn"
+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)
+
+test -z "${default_jdk}" && default_jdk="${jvmdir}/java"
+test -z "${default_jre}" && default_jre="${jvmdir}/jre"
+
+test -z "${scl_root_relative}" -a -n "${scl_root}" && scl_root_relative=$(sed
"s:^/*::" <<<"${scl_root}")
+scl_suffix="${scl:+.$scl}"
+return 0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/javapackages-4.7.0+git20170331.ef4057e7/depgenerators/fileattrs/javadoc.attr
new/javapackages-5.0.0+git20180104.9367c8f6/depgenerators/fileattrs/javadoc.attr
---
old/javapackages-4.7.0+git20170331.ef4057e7/depgenerators/fileattrs/javadoc.attr
2017-03-31 05:34:20.000000000 +0200
+++
new/javapackages-5.0.0+git20180104.9367c8f6/depgenerators/fileattrs/javadoc.attr
2018-01-04 14:06:42.000000000 +0100
@@ -1,3 +1,3 @@
-%__javadoc_requires %{?scl:@{javadir}-utils/scl-enable %{?scl_maven} %{scl}
-- }%{_rpmconfigdir}/javadoc.req
+%__javadoc_requires %{?scl:@{javadir}-utils/scl-enable %{?scl_maven} %{scl}
-- }%{_rpmconfigdir}/javadoc@{scl_suffix}.req
%__javadoc_requires_opts %{?scl:--scl %{?scl}}
%__javadoc_path ^%{_javadocdir}/.[^/]*$
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/javapackages-4.7.0+git20170331.ef4057e7/depgenerators/fileattrs/maven.attr
new/javapackages-5.0.0+git20180104.9367c8f6/depgenerators/fileattrs/maven.attr
---
old/javapackages-4.7.0+git20170331.ef4057e7/depgenerators/fileattrs/maven.attr
2017-03-31 05:34:20.000000000 +0200
+++
new/javapackages-5.0.0+git20180104.9367c8f6/depgenerators/fileattrs/maven.attr
2018-01-04 14:06:42.000000000 +0100
@@ -1,5 +1,5 @@
-%__maven_provides %{?scl:@{javadir}-utils/scl-enable %{?scl_maven} %{scl}
-- }%{_rpmconfigdir}/maven.prov
+%__maven_provides %{?scl:@{javadir}-utils/scl-enable %{?scl_maven} %{scl}
-- }%{_rpmconfigdir}/maven@{scl_suffix}.prov
%__maven_provides_opts --cachedir %{_builddir}/%{?buildsubdir} --rpm-pid
%{lua:print(math.floor(posix.getprocessid("pid")))} %{?scl:--scl %{?scl}}
-%__maven_requires %{?scl:@{javadir}-utils/scl-enable %{?scl_maven} %{scl}
-- }%{_rpmconfigdir}/maven.req
+%__maven_requires %{?scl:@{javadir}-utils/scl-enable %{?scl_maven} %{scl}
-- }%{_rpmconfigdir}/maven@{scl_suffix}.req
%__maven_requires_opts --cachedir %{_builddir}/%{?buildsubdir} --rpm-pid
%{lua:print(math.floor(posix.getprocessid("pid")))} %{?scl:--scl %{?scl}}
%__maven_path ^%{_datadir}/maven-metadata/.*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/javapackages-4.7.0+git20170331.ef4057e7/depgenerators/fileattrs/osgi.attr
new/javapackages-5.0.0+git20180104.9367c8f6/depgenerators/fileattrs/osgi.attr
---
old/javapackages-4.7.0+git20170331.ef4057e7/depgenerators/fileattrs/osgi.attr
2017-03-31 05:34:20.000000000 +0200
+++
new/javapackages-5.0.0+git20180104.9367c8f6/depgenerators/fileattrs/osgi.attr
2018-01-04 14:06:42.000000000 +0100
@@ -1,5 +1,5 @@
-%__osgi_provides %{?scl:@{javadir}-utils/scl-enable %{?scl_maven} %{scl}
-- }%{_rpmconfigdir}/osgi.prov
+%__osgi_provides %{?scl:@{javadir}-utils/scl-enable %{?scl_maven} %{scl}
-- }%{_rpmconfigdir}/osgi@{scl_suffix}.prov
%__osgi_provides_opts --cachedir %{_builddir}/%{?buildsubdir} --rpm-pid
%{lua:print(math.floor(posix.getprocessid("pid")))} %{?scl:--scl %{?scl}}
-%__osgi_requires
%{!?scl:%{_rpmconfigdir}/osgi.req}%{?scl:%{_root_bindir}/true}
+%__osgi_requires
%{!?scl:%{_rpmconfigdir}/osgi@{scl_suffix}.req}%{?scl:%{_root_bindir}/true}
%__osgi_requires_opts --cachedir %{_builddir}/%{?buildsubdir} --rpm-pid
%{lua:print(math.floor(posix.getprocessid("pid")))} %{?scl:--scl %{?scl}}
%__osgi_path
^(.*\\.jar|((%{_prefix}/lib(64)?|%{_datadir})/.*/META-INF/MANIFEST.MF))$
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/javapackages-4.7.0+git20170331.ef4057e7/etc/eclipse.conf
new/javapackages-5.0.0+git20180104.9367c8f6/etc/eclipse.conf
--- old/javapackages-4.7.0+git20170331.ef4057e7/etc/eclipse.conf
1970-01-01 01:00:00.000000000 +0100
+++ new/javapackages-5.0.0+git20180104.9367c8f6/etc/eclipse.conf
2018-01-04 14:06:42.000000000 +0100
@@ -0,0 +1,25 @@
+# Eclipse filesystem configuration file
+
+# Eclipse platform root directory
+eclipse.root=@{prefix}/lib/eclipse
+
+# Location of architecture-independant dropins
+eclipse.dropins.noarch=@{datadir}/eclipse/dropins
+
+# Location of architecture-independant droplets
+eclipse.droplets.noarch=@{datadir}/eclipse/droplets
+
+# Location of architecture-dependant dropins
+eclipse.dropins.archful=@{prefix}/lib/eclipse/dropins
+
+# Location of architecture-dependant droplets
+eclipse.droplets.archful=@{prefix}/lib/eclipse/droplets
+
+# Comma-separated list of directories searched for external bundles
+eclipse.bundles=@{javadir},@{jnidir}
+
+# Software collection ID (empty if not SCL)
+scl.namespace=@{scl}
+
+# Software collection root directory (empty if not SCL)
+scl.root=@{scl_root}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/javapackages-4.7.0+git20170331.ef4057e7/etc/java.conf
new/javapackages-5.0.0+git20180104.9367c8f6/etc/java.conf
--- old/javapackages-4.7.0+git20170331.ef4057e7/etc/java.conf 2017-03-31
05:34:20.000000000 +0200
+++ new/javapackages-5.0.0+git20180104.9367c8f6/etc/java.conf 2018-01-04
14:06:42.000000000 +0100
@@ -6,19 +6,8 @@
# Location of arch-specific jar files on the system
JNI_LIBDIR=@{jnidir}
-# Root of all JVM installations
-JVM_ROOT=@{jvmdir}
-
-# You can define a system-wide JVM root here if you're not using the
-# default one.
-#
-# If you have a base JRE package installed
-# (e.g. java-1.6.0-openjdk):
-#JAVA_HOME=$JVM_ROOT/jre
-#
-# If you have a devel JDK package installed
-# (e.g. java-1.6.0-openjdk-devel):
-#JAVA_HOME=$JVM_ROOT/java
+# You can define a system-wide JVM here if you're not using the default one.
+#JAVA_HOME=
# Options to pass to the java interpreter
#JAVACMD_OPTS=
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/javapackages-4.7.0+git20170331.ef4057e7/expand.sh
new/javapackages-5.0.0+git20180104.9367c8f6/expand.sh
--- old/javapackages-4.7.0+git20170331.ef4057e7/expand.sh 1970-01-01
01:00:00.000000000 +0100
+++ new/javapackages-5.0.0+git20180104.9367c8f6/expand.sh 2018-01-04
14:06:42.000000000 +0100
@@ -0,0 +1,61 @@
+# Copyright (c) 2013-2017 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 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]>
+
+expand()
+{
+ local target
+ if [[ -n "${2}" ]]; then
+ target="${2}"
+ else
+ target=target/$(basename "${1}")
+ fi
+
+ sed \
+ -e "s|@{scl}|${scl}|g" \
+ -e "s|@{scl_root}|${scl_root}|g" \
+ -e "s|@{scl_root_relative}|${scl_root_relative}|g" \
+ -e "s|@{scl_suffix}|${scl_suffix}|g" \
+ -e "s|@{bindir}|${bindir}|g" \
+ -e "s|@{datadir}|${datadir}|g" \
+ -e "s|@{javaconfdir}|${javaconfdir}|g" \
+ -e "s|@{javadir}|${javadir}|g" \
+ -e "s|@{jnidir}|${jnidir}|g" \
+ -e "s|@{jvmdir}|${jvmdir}|g" \
+ -e "s|@{m2home}|${m2home}|g" \
+ -e "s|@{prefix}|${prefix}|g" \
+ -e "s|@{rundir}|${rundir}|g" \
+ -e "s|@{sysconfdir}|${sysconfdir}|g" \
+ -e "s|@{pyinterpreter}|${pyinterpreter}|g" \
+ -e "s|@{abrtlibdir}|${abrtlibdir}|g" \
+ -e "s|@{default_jdk}|${default_jdk}|g" \
+ -e "s|@{default_jre}|${default_jre}|g" \
+ "${1}" >"${target}"
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/javapackages-4.7.0+git20170331.ef4057e7/install
new/javapackages-5.0.0+git20180104.9367c8f6/install
--- old/javapackages-4.7.0+git20170331.ef4057e7/install 2017-03-31
05:34:20.000000000 +0200
+++ new/javapackages-5.0.0+git20180104.9367c8f6/install 2018-01-04
14:06:42.000000000 +0100
@@ -58,8 +58,8 @@
inst()
{
install -d -m 755 "${DEST}/${3}"
- install -p -m 644 "${2}" "${DEST}/${3}/"
- echo "${1} ${3}/"$(basename "${2}")
+ install -p -m 644 "${2}" "${DEST}/${3}/${4}"
+ echo "${1} ${3}/${4:-$(basename "${2}")}"
}
inst_data() { inst "%attr(0644,root,root)" "${@}"; }
@@ -91,8 +91,19 @@
dir "${ivyxmldir}"
dir "${datadir}/maven-metadata"
dir "${m2home}"
+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 "${datadir}/eclipse"
+dir "${datadir}/eclipse/dropins"
+dir "${datadir}/eclipse/droplets"
dir "${rpmconfigdir}"
-dir "${rpmconfigdir}/macros.d"
+dir "${rpmconfigdir}"
+if [[ -n "${scl}" ]]; then
+ dir "${javadir}-utils/scl-template"
+fi
inst_exec target/build-classpath "${bindir}"
inst_exec target/build-classpath-directory "${bindir}"
@@ -107,12 +118,16 @@
inst_config etc/font.properties "${javaconfdir}"
inst_config target/java.conf "${javaconfdir}"
+inst_config target/eclipse.conf "${javaconfdir}"
inst_data target/java-functions "${javadir}-utils"
inst_exec java-utils/java-wrapper "${javadir}-utils"
inst_exec java-utils/scl-enable "${javadir}-utils"
-inst_data target/macros.jpackage "${rpmconfigdir}/macros.d"
+if [[ -z "${scl}" ]]; then
+ # in scl, macros.jpackage is installed in javapackages-local
+ inst_data target/macros.jpackage "${rpmmacrodir}"
+fi
inst_data target/build-classpath.1 "${mandir}/man1"
inst_data target/build-jar-repository.1 "${mandir}/man1"
@@ -124,6 +139,16 @@
inst_data target/javapackages-metadata.xml "${datadir}/maven-metadata"
inst_data target/configuration.xml "${m2home}"
+
+if [[ -n "${scl}" ]]; then
+ inst_data target/configure-base.sh "${javadir}-utils/scl-template"
+ inst_data expand.sh "${javadir}-utils/scl-template"
+ inst_data configs/configuration-SCL.xml "${javadir}-utils/scl-template"
+ inst_data etc/javapackages-config-SCL.json "${javadir}-utils/scl-template"
+ inst_data etc/java.conf "${javadir}-utils/scl-template"
+ inst_data etc/eclipse.conf "${javadir}-utils/scl-template"
+fi
+
if [ -z "$pyinterpreter" ]; then
exit 0
fi
@@ -150,7 +175,17 @@
inst_data java-utils/mvn_file.py "${javadir}-utils"
inst_data java-utils/mvn_package.py "${javadir}-utils"
-inst_data target/macros.fjava "${rpmconfigdir}/macros.d"
+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.
+ 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"
+else
+ inst_data target/macros.fjava "${rpmmacrodir}"
+fi
inst_data target/abs2rel.1 "${mandir}/man1"
inst_data target/mvn_alias.7 "${mandir}/man7"
@@ -176,15 +211,15 @@
inst_data target/pom_xpath_replace.7 "${mandir}/man7"
inst_data target/pom_xpath_set.7 "${mandir}/man7"
-inst_exec target/maven.prov "${rpmconfigdir}"
-inst_exec target/maven.req "${rpmconfigdir}"
-inst_exec target/osgi.prov "${rpmconfigdir}"
-inst_exec target/osgi.req "${rpmconfigdir}"
-inst_exec target/javadoc.req "${rpmconfigdir}"
-
-inst_data target/maven.attr "${rpmconfigdir}/fileattrs"
-inst_data target/osgi.attr "${rpmconfigdir}/fileattrs"
-inst_data target/javadoc.attr "${rpmconfigdir}/fileattrs"
+inst_exec target/maven.prov "${rpmconfigdir}" "maven${scl_suffix}.prov"
+inst_exec target/maven.req "${rpmconfigdir}" "maven${scl_suffix}.req"
+inst_exec target/osgi.prov "${rpmconfigdir}" "osgi${scl_suffix}.prov"
+inst_exec target/osgi.req "${rpmconfigdir}" "osgi${scl_suffix}.req"
+inst_exec target/javadoc.req "${rpmconfigdir}" "javadoc${scl_suffix}.req"
+
+inst_data target/maven.attr "${rpmconfigdir}/fileattrs"
"maven${scl_suffix}.attr"
+inst_data target/osgi.attr "${rpmconfigdir}/fileattrs" "osgi${scl_suffix}.attr"
+inst_data target/javadoc.attr "${rpmconfigdir}/fileattrs"
"javadoc${scl_suffix}.attr"
inst_config target/javapackages-config.json "${javaconfdir}"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/javapackages-4.7.0+git20170331.ef4057e7/java-utils/java-functions
new/javapackages-5.0.0+git20180104.9367c8f6/java-utils/java-functions
--- old/javapackages-4.7.0+git20170331.ef4057e7/java-utils/java-functions
2017-03-31 05:34:20.000000000 +0200
+++ new/javapackages-5.0.0+git20180104.9367c8f6/java-utils/java-functions
2018-01-04 14:06:42.000000000 +0100
@@ -57,14 +57,12 @@
local IFS
local JAVA_LIBDIR
local JNI_LIBDIR
- local JVM_ROOT
if [ -f "${1}" ]; then
_log "Loading config file: ${1}"
. "${1}"
_javadirs="${_javadirs}${_javadirs:+:}${JAVA_LIBDIR}:${JNI_LIBDIR}"
- _jvmdirs="${_jvmdirs}${_jvmdirs:+:}${JVM_ROOT}"
else
_log "Skipping config file ${1}: file does not exist"
fi
@@ -80,7 +78,6 @@
local conf
unset _javadirs
- unset _jvmdirs
set -- ${JAVACONFDIRS:-@{javaconfdir}}
@@ -101,7 +98,6 @@
_load_java_conf_file "${HOME}/.java/java.conf"
_javadirs=${_javadirs:-@{javadir}:@{jnidir}}
- _jvmdirs=${_jvmdirs:-@{jvmdir}}
if [ -d "${java_home_save}" ]; then
JAVA_HOME="${java_home_save}"
@@ -125,38 +121,27 @@
{
local IFS=:
local jvmdir
- local subdir
- local subdirs
if [ -n "${JAVA_HOME}" ]; then
- if [ -z "${JVM_ROOT}" ]; then
- JVM_ROOT=$(readlink -f "${JAVA_HOME}"/.. || :)
- fi
- return
+ return
fi
case "${_prefer_jre}" in
- 1|[Yy][Ee][Ss]|[Tt][Rr][Uu][Ee])
- subdirs=jre:java
- ;;
- *)
- subdirs=java:jre
- ;;
+ 1|[Yy][Ee][Ss]|[Tt][Rr][Uu][Ee])
+ dirs="@{default_jre}:@{default_jdk}"
+ ;;
+ *)
+ dirs="@{default_jdk}:@{default_jre}"
+ ;;
esac
- for subdir in $subdirs; do
- for jvmdir in $_jvmdirs; do
- JVM_ROOT="${jvmdir}"
- JAVA_HOME="${jvmdir}/${subdir}"
- if [ -d "${JVM_ROOT}" -a -d "${JAVA_HOME}" ]; then
- _log "Using configured JVM_ROOT: ${JVM_ROOT}"
- _log "Using configured JAVA_HOME: ${JAVA_HOME}"
- return
- fi
- done
+ for JAVA_HOME in $dirs; do
+ if [ -d "${JAVA_HOME}" ]; then
+ _log "Using configured JAVA_HOME: ${JAVA_HOME}"
+ return
+ fi
done
- unset JVM_ROOT
unset JAVA_HOME
}
@@ -164,41 +149,17 @@
set_jvm()
{
local IFS=:
- local cmd
- local cmds
+ local javaconfdirs
_set_java_home
- # use $JAVA_HOME if defined
- if [ -n "${JAVA_HOME}" ]; then
- return
+ if [ -z "${JAVA_HOME}" ]; then
+ javaconfdirs="${JAVACONFDIRS:-@{javaconfdir}}"
+ _err "JAVA_HOME is not set and default java installation was not
found. JAVA_HOME for system applications can be set in java.conf in
${javaconfdirs}"
+ exit 1
fi
- # try to find it from java command
-
- # try javac first, or we might get the location of the jre instead - djw
- # if JRE is prefered then don't try javac - mizdebsk
- case "${_prefer_jre}" in
- 1|[Yy][Ee][Ss]|[Tt][Rr][Uu][Ee])
- cmds=java
- ;;
- *)
- cmds=javac:java
- ;;
- esac
-
- for cmd in $cmds; do
- cmd=$(which "${cmd}" 2>/dev/null || :)
-
- if [ -n "${cmd}" ]; then
- cmd=$(readlink -f "${cmd}")
- export JAVA_HOME=$(readlink -f "${cmd%/*}"/.. || :)
- return
- fi
- done
-
- echo "Can't find Java virtual machine, aborting."
- exit 1
+ return 0
}
# Set the classpath
@@ -361,6 +322,7 @@
[ -z "$_PRESERVE_NAMING" ] \
&& extension=[$(echo $extension | sed 's+/+][+g')] \
|| extension=$(echo $extension | sed 's+/+_+g')
+ extension=$(echo "$extension" | sed 's+:+@+')
if [ $found -eq 0 ] ; then
if [ -d "$found_extension" ] ; then
for jar in $(find "$found_extension" -follow -name "*.jar") ; do
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/javapackages-4.7.0+git20170331.ef4057e7/java-utils/mvn_artifact.py
new/javapackages-5.0.0+git20180104.9367c8f6/java-utils/mvn_artifact.py
--- old/javapackages-4.7.0+git20170331.ef4057e7/java-utils/mvn_artifact.py
2017-03-31 05:34:20.000000000 +0200
+++ new/javapackages-5.0.0+git20180104.9367c8f6/java-utils/mvn_artifact.py
2018-01-04 14:06:42.000000000 +0100
@@ -246,24 +246,31 @@
if len(args) < 1:
parser.error("At least 1 argument is required")
- try:
- uart = Artifact.from_mvn_str(args[0])
- uart.validate(allow_backref=False)
- if len(args) == 1:
- parser.error("When using artifact specification artifact path must
be "
- "provided")
- if not (uart.groupId and uart.artifactId and uart.version):
- parser.error("Defined artifact has to include at least groupId, "
- "artifactId and version")
- except (ArtifactFormatException):
- if is_it_ivy_file(args[0]):
- uart = IvyFile(args[0])
+ pom_path = None
+ if os.path.exists(args[0]):
+ pom_path = args[0]
+ if is_it_ivy_file(pom_path):
+ uart = IvyFile(pom_path)
else:
# it should be good old POM file
- uart = POM(args[0])
- pom_path = args[0]
+ uart = POM(pom_path)
+ elif ':' in args[0]:
+ try:
+ uart = Artifact.from_mvn_str(args[0])
+ uart.validate(allow_backref=False)
+ if len(args) == 1:
+ parser.error("When using artifact specification artifact path
must be "
+ "provided")
+ if not (uart.groupId and uart.artifactId and uart.version):
+ parser.error("Defined artifact has to include at least
groupId, "
+ "artifactId and version")
+ except ArtifactFormatException as e:
+ parser.error("Failed to parse artifact string: {0}".format(e))
else:
- pom_path = None
+ message = ("The first argument '{0}' doesn't point to an existing file
"
+ "nor it looks like an artifact string").format(args[0])
+ parser.error(message)
+
art = MetadataArtifact(uart.groupId, uart.artifactId, version=uart.version)
if hasattr(uart, "extension") and uart.extension:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/javapackages-4.7.0+git20170331.ef4057e7/java-utils/pom_editor.py
new/javapackages-5.0.0+git20180104.9367c8f6/java-utils/pom_editor.py
--- old/javapackages-4.7.0+git20170331.ef4057e7/java-utils/pom_editor.py
2017-03-31 05:34:20.000000000 +0200
+++ new/javapackages-5.0.0+git20180104.9367c8f6/java-utils/pom_editor.py
2018-01-04 14:06:42.000000000 +0100
@@ -490,7 +490,7 @@
@macro()
def pom_xpath_inject(where, xml_string, pom=None):
- """<XPath> [XML code] [POM location]"""
+ """<XPath> <XML code> [POM location]"""
for element in pom.xpath_query(where):
pom.inject_xml(element, annotate(pom.subtree_from_string(xml_string)))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/javapackages-4.7.0+git20170331.ef4057e7/java-utils/scl-enable
new/javapackages-5.0.0+git20180104.9367c8f6/java-utils/scl-enable
--- old/javapackages-4.7.0+git20170331.ef4057e7/java-utils/scl-enable
2017-03-31 05:34:20.000000000 +0200
+++ new/javapackages-5.0.0+git20180104.9367c8f6/java-utils/scl-enable
2018-01-04 14:06:42.000000000 +0100
@@ -1,6 +1,6 @@
#!/bin/bash
#-
-# Copyright (c) 2016, Red Hat, Inc.
+# Copyright (c) 2016-2017, Red Hat, Inc.
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -31,7 +31,8 @@
#
# Authors: Mikolaj Izdebski <[email protected]>
-set -e
+# Not all enable scripts are designed to work with -e
+set +e
while [[ "$1" != -- ]]; do
[[ -f "/etc/scl/conf/$1" ]]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/javapackages-4.7.0+git20170331.ef4057e7/javapackages-tools.spec
new/javapackages-5.0.0+git20180104.9367c8f6/javapackages-tools.spec
--- old/javapackages-4.7.0+git20170331.ef4057e7/javapackages-tools.spec
2017-03-31 05:34:20.000000000 +0200
+++ new/javapackages-5.0.0+git20180104.9367c8f6/javapackages-tools.spec
2018-01-04 14:06:42.000000000 +0100
@@ -17,8 +17,11 @@
%else
%global python_prefix python
%global python_interpreter %{__python2}
+%global rpmmacrodir /etc/rpm
%endif
+%global default_jdk
%{?_root_prefix}%{!?_root_prefix:%{_prefix}}/lib/jvm/java-1.8.0-openjdk
+%global default_jre
%{?_root_prefix}%{!?_root_prefix:%{_prefix}}/lib/jvm/jre-1.8.0-openjdk
Name: %{?scl_prefix}%{pkg_name}
Version: 5.0.0
@@ -47,7 +50,11 @@
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.
@@ -121,7 +128,7 @@
Requires: %{?scl_prefix}xmvn-subst >= 3.0.0
Requires: %{?scl_prefix}xmvn-resolve >= 3.0.0
# Java build systems don't have hard requirement on java-devel, so it should
be there
-Requires: java-devel
+Requires: java-1.8.0-openjdk-devel
Requires: %{?scl_prefix}%{python_prefix}-javapackages =
%{version}-%{release}
Requires: %{python_prefix}
@@ -132,31 +139,18 @@
%setup -q -n %{pkg_name}-%{version}
%build
-%configure --pyinterpreter=%{python_interpreter}
%{?scl:--rpmconfigdir=%{_root_prefix}/lib/rpm --scl=%{scl}
--scl_root=%{_scl_root}}
+%configure --pyinterpreter=%{python_interpreter} \
+ --default_jdk=%{default_jdk} --default_jre=%{default_jre} \
+ --rpmmacrodir=%{rpmmacrodir} \
+ %{?scl:--rpmconfigdir=%{_root_prefix}/lib/rpm --scl=%{scl}
--scl_root=%{_scl_root}}
./build
%install
./install
-sed -i 's|mvn_build.py|& --xmvn-javadoc|' $(find %{buildroot} -name
macros.fjava)
+sed -i 's|mvn_build.py|& --xmvn-javadoc|' $(find %{buildroot} -name
'macros*.fjava')
sed -e 's/.[17]$/&.gz/' -e 's/.py$/&*/' -i files-*
-%{?scl:
- mv %{buildroot}%{_root_prefix}/lib/rpm/macros.d/macros{,.%{scl}}.fjava
- mv %{buildroot}%{_root_prefix}/lib/rpm/macros.d/macros{,.%{scl}}.jpackage
- mv %{buildroot}%{_root_prefix}/lib/rpm/maven{,.%{scl}}.req
- mv %{buildroot}%{_root_prefix}/lib/rpm/maven{,.%{scl}}.prov
- mv %{buildroot}%{_root_prefix}/lib/rpm/osgi{,.%{scl}}.req
- mv %{buildroot}%{_root_prefix}/lib/rpm/osgi{,.%{scl}}.prov
- mv %{buildroot}%{_root_prefix}/lib/rpm/javadoc{,.%{scl}}.req
- mv %{buildroot}%{_root_prefix}/lib/rpm/fileattrs/maven{,.%{scl}}.attr
- mv %{buildroot}%{_root_prefix}/lib/rpm/fileattrs/osgi{,.%{scl}}.attr
- mv %{buildroot}%{_root_prefix}/lib/rpm/fileattrs/javadoc{,.%{scl}}.attr
- sed -i 's:\(macros\.\)\(fjava\|jpackage\):\1%{scl}.\2:' files-*
- sed -i 's:\(maven\|osgi\|javadoc\)\.\(req\|prov\|attr\):\1.%{scl}.\2:' \
- files-* %{buildroot}%{_root_prefix}/lib/rpm/*.{req,prov}
-}
-
%if %{without gradle}
rm -rf %{buildroot}%{_bindir}/gradle-local
rm -rf %{buildroot}%{_datadir}/gradle-local
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/javapackages-4.7.0+git20170331.ef4057e7/macros.d/macros.fjava
new/javapackages-5.0.0+git20180104.9367c8f6/macros.d/macros.fjava
--- old/javapackages-4.7.0+git20170331.ef4057e7/macros.d/macros.fjava
2017-03-31 05:34:20.000000000 +0200
+++ new/javapackages-5.0.0+git20180104.9367c8f6/macros.d/macros.fjava
2018-01-04 14:06:42.000000000 +0100
@@ -155,6 +155,7 @@
#
%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}" \
%{-J*:jdir="%{-J*}"}%{!-J*:jdir=target/site/apidocs; [ -d .xmvn/apidocs ] &&
jdir=.xmvn/apidocs} \
+%{__mkdir_p} %{buildroot}%{_licensedir} \
if [ -d "${jdir}" ]; then \
install -dm755
%{buildroot}%{_javadocdir}/%{?scl:%{pkg_name}}%{!?scl:%{name}} \
cp -pr "${jdir}"/*
%{buildroot}%{_javadocdir}/%{?scl:%{pkg_name}}%{!?scl:%{name}} \
@@ -163,9 +164,21 @@
%{nil}
+# %mvn_subst - replace all JAR files in given directory with symlinks
+#
+# Usage: %mvn_subst [options] path
+#
+# 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}
+
+
#==============================================================================
#
# add_maven_depmap is simplified version of jpackage-style add_to_maven_depmap
+#
+# IMPORTANT: This macro is obsolete. Use mvn_artifact macro instead.
+#
# -f addition to fragment name
# -a is "g1:a1,g2:a2" formatted string with additional depmaps
(groupId:artifactId,...)
# -v is "v1,v2" formatted string with additional compatibility versions
@@ -182,6 +195,8 @@
%add_maven_depmap(f:a:v:) \
set -e \
+%{lua:io.stderr:write("[WARNING] Deprecated \%add_maven_depmap macro is used.
", \
+"Please use \%mvn_artifact and %mvn_install instead.\\n")} \
# default values \
%if %# == 0 \
_pompart="JPP-%{?scl:%{pkg_name}}%{!?scl:%{name}}.pom" \
@@ -482,3 +497,32 @@
%pom_change_dep(rf) %{expand: %{__pom_call}change_dep %**
}
+
+# %javadoc_package - generate javadoc subpackage definition
+#
+# Usage: %javadoc_package [options]
+
+# This macro generates %package and %files definitions for a javadoc
subpackage.
+# Use on top-level only, preferably just before %prep.
+# Prerequisites:
+# - javadoc package must not already exist
+# - package must use %mvn_install to install javadoc (default when using
%mvn_build)
+# - package should install license files using %license macro, or specify
+# license for javadoc package manually (see below)
+#
+# Manually specifying license files:
+# Use -L option to suppress automatic license installation and specify %license
+# directive on the next line after the macro invocation. Example:
+# %javadoc_package -L
+# %license LICENSE
+%javadoc_package(L) %if 0%{!?_without_javadoc:1} \
+%package javadoc \
+Summary: API documentation for %{?scl:%{pkg_name}}%{!?scl:%{name}} \
+%description javadoc \
+API documentation for %{?scl:%{pkg_name}}%{!?scl:%{name}}. \
+%files javadoc -f .mfiles-javadoc \
+%if 0%{!?-L:1} \
+%%license %{_licensedir} \
+%exclude %dir %{_licensedir} \
+%endif \
+%endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/javapackages-4.7.0+git20170331.ef4057e7/macros.d/macros.jpackage
new/javapackages-5.0.0+git20180104.9367c8f6/macros.d/macros.jpackage
--- old/javapackages-4.7.0+git20170331.ef4057e7/macros.d/macros.jpackage
2017-03-31 05:34:20.000000000 +0200
+++ new/javapackages-5.0.0+git20180104.9367c8f6/macros.d/macros.jpackage
2018-01-04 14:06:42.000000000 +0100
@@ -85,14 +85,14 @@
#
# Current default JVM home.
#
-%java_home %(. %{_javadir}-utils/java-functions; set_jvm; echo $JAVA_HOME)
+%java_home %(. @{javadir}-utils/java-functions; set_jvm; echo $JAVA_HOME)
#==============================================================================
# ---- default Java commands
%ant JAVA_HOME=%{java_home} %{?scl:@{javadir}-utils/scl-enable
%{?scl_maven} %{scl} -- }ant
%jar %{java_home}/bin/jar
-%java %(. %{_javadir}-utils/java-functions; set_javacmd; echo
$JAVACMD)
+%java %(. @{javadir}-utils/java-functions; set_javacmd; echo
$JAVACMD)
%javac %{java_home}/bin/javac
%javadoc %{java_home}/bin/javadoc
@@ -119,7 +119,7 @@
\
# Source functions library\
_prefer_jre="%{?6}"\
-. %{_javadir}-utils/java-functions\
+. @{javadir}-utils/java-functions\
\
# Source system prefs\
if [ -f %{_sysconfdir}/java/%{name}.conf ] ; then\
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/javapackages-4.7.0+git20170331.ef4057e7/macros.d/macros.scl-java-template
new/javapackages-5.0.0+git20180104.9367c8f6/macros.d/macros.scl-java-template
---
old/javapackages-4.7.0+git20170331.ef4057e7/macros.d/macros.scl-java-template
1970-01-01 01:00:00.000000000 +0100
+++
new/javapackages-5.0.0+git20180104.9367c8f6/macros.d/macros.scl-java-template
2018-01-04 14:06:42.000000000 +0100
@@ -0,0 +1,68 @@
+# Copyright (c) 2017, 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 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: Michael Simacek <[email protected]>
+
+%scl_install_java \
+( \
+ . @{javadir}-utils/scl-template/configure-base.sh --scl=%{scl}
--scl_root=%{_scl_root} \\\
+ --rpmconfigdir=%{_root_prefix}/lib/rpm \\\
+ --prefix=%{_prefix} --sysconfdir=%{_sysconfdir} \
+ . @{javadir}-utils/scl-template/expand.sh \
+ template_config () { \
+ expand "@{javadir}-utils/scl-template/$1" "%{buildroot}$2" \
+ echo "%config(noreplace) $2" >> .java-filelist \
+ } \
+ dir () { \
+ mkdir -p "%{buildroot}/$1"; echo "%dir $1" >> .java-filelist \
+ } \
+ dir "%{_javaconfdir}" \
+ dir "%{_javadir}" \
+ dir "%{_jnidir}" \
+ dir "%{_javadocdir}" \
+ dir "%{_mavenpomdir}" \
+ 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 "%{_datadir}/eclipse" \
+ dir "%{_datadir}/eclipse/dropins" \
+ dir "%{_datadir}/eclipse/droplets" \
+ dir "%{_sysconfdir}/xdg" \
+ dir "%{_sysconfdir}/xdg/xmvn" \
+ template_config javapackages-config-SCL.json
%{_javaconfdir}/javapackages-config.json \
+ template_config configuration-SCL.xml
%{_sysconfdir}/xdg/xmvn/configuration.xml \
+ template_config java.conf %{_javaconfdir}/java.conf \
+ template_config eclipse.conf %{_javaconfdir}/eclipse.conf \
+) \
+%{nil}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/javapackages-4.7.0+git20170331.ef4057e7/man/pom_xpath_inject.txt
new/javapackages-5.0.0+git20180104.9367c8f6/man/pom_xpath_inject.txt
--- old/javapackages-4.7.0+git20170331.ef4057e7/man/pom_xpath_inject.txt
2017-03-31 05:34:20.000000000 +0200
+++ new/javapackages-5.0.0+git20180104.9367c8f6/man/pom_xpath_inject.txt
2018-01-04 14:06:42.000000000 +0100
@@ -10,7 +10,7 @@
SYNOPSIS
--------
-*%pom_xpath_inject* XPath [XML-code] [XML-file-location]...
+*%pom_xpath_inject* XPath XML-code [XML-file-location]...
DESCRIPTION
-----------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/javapackages-4.7.0+git20170331.ef4057e7/python/javapackages/common/manifest.py
new/javapackages-5.0.0+git20180104.9367c8f6/python/javapackages/common/manifest.py
---
old/javapackages-4.7.0+git20170331.ef4057e7/python/javapackages/common/manifest.py
2017-03-31 05:34:20.000000000 +0200
+++
new/javapackages-5.0.0+git20180104.9367c8f6/python/javapackages/common/manifest.py
2018-01-04 14:06:42.000000000 +0100
@@ -33,7 +33,7 @@
# Michal Srb <[email protected]>
import zipfile
-from zipfile import ZipFile
+from zipfile import ZipFile, BadZipfile
from javapackages.common.exception import JavaPackagesToolsException
@@ -61,7 +61,7 @@
jarfile = ZipFile(self._path)
if "META-INF/MANIFEST.MF" in jarfile.namelist():
mf = jarfile.open("META-INF/MANIFEST.MF", "r")
- except IOError:
+ except (IOError, BadZipfile):
pass
if mf is None:
return None
Binary files
old/javapackages-4.7.0+git20170331.ef4057e7/test/data/osgi/corrupt/buildroot/usr/share/java/corrupt.jar
and
new/javapackages-5.0.0+git20180104.9367c8f6/test/data/osgi/corrupt/buildroot/usr/share/java/corrupt.jar
differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/javapackages-4.7.0+git20170331.ef4057e7/test/mvn_artifact_test.py
new/javapackages-5.0.0+git20180104.9367c8f6/test/mvn_artifact_test.py
--- old/javapackages-4.7.0+git20170331.ef4057e7/test/mvn_artifact_test.py
2017-03-31 05:34:20.000000000 +0200
+++ new/javapackages-5.0.0+git20180104.9367c8f6/test/mvn_artifact_test.py
2018-01-04 14:06:42.000000000 +0100
@@ -57,6 +57,18 @@
report = self.check_result(inspect.currentframe().f_code.co_name)
self.assertEqual(report, '', report)
+ @mvn_artifact('nonexistent.pom', 'maven-artifact.jar')
+ def test_nonexistent(self, stdout, stderr, return_value):
+ self.assertNotEqual(0, return_value)
+ self.assertFalse("Traceback" in stderr)
+ self.assertTrue("existing file" in stderr)
+
+ @mvn_artifact('invalid::artifact', 'maven-artifact.jar')
+ def test_invalid_artifact_string(self, stdout, stderr, return_value):
+ self.assertNotEqual(0, return_value)
+ self.assertFalse("Traceback" in stderr)
+ self.assertTrue("artifactId" in stderr)
+
@mvn_artifact('args4j.pom', 'maven-artifact.jar')
def test_basic_jar(self, stdout, stderr, return_value):
self.assertEqual(return_value, 0, stderr)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/javapackages-4.7.0+git20170331.ef4057e7/test/osgi_req_test.py
new/javapackages-5.0.0+git20180104.9367c8f6/test/osgi_req_test.py
--- old/javapackages-4.7.0+git20170331.ef4057e7/test/osgi_req_test.py
2017-03-31 05:34:20.000000000 +0200
+++ new/javapackages-5.0.0+git20180104.9367c8f6/test/osgi_req_test.py
2018-01-04 14:06:42.000000000 +0100
@@ -56,5 +56,11 @@
assertIn(self, "osgi(bar) = 4.5.6", sout)
self.assertEqual(len(sout), 1, sout)
+ @osgireq(["corrupt/buildroot/usr/share/java/corrupt.jar"])
+ def test_corrupt(self, stdout, stderr, return_value):
+ self.assertEqual(return_value, 0, stderr)
+ sout = [x for x in stdout.split('\n') if x]
+ self.assertEqual(len(sout), 0, sout)
+
if __name__ == '__main__':
unittest.main()
++++++ python-optional.patch ++++++
--- /var/tmp/diff_new_pack.xQfWou/_old 2018-01-30 15:41:53.101659928 +0100
+++ /var/tmp/diff_new_pack.xQfWou/_new 2018-01-30 15:41:53.101659928 +0100
@@ -1,30 +1,18 @@
-Index: javapackages-4.7.0+git20170331.ef4057e7/build
+Index: javapackages-5.0.0+git20180104.9367c8f6/build
===================================================================
---- javapackages-4.7.0+git20170331.ef4057e7.orig/build
-+++ javapackages-4.7.0+git20170331.ef4057e7/build
-@@ -141,5 +141,3 @@ manpage build-classpath
+--- javapackages-5.0.0+git20180104.9367c8f6.orig/build
++++ javapackages-5.0.0+git20180104.9367c8f6/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-4.7.0+git20170331.ef4057e7/configure
+Index: javapackages-5.0.0+git20180104.9367c8f6/install
===================================================================
---- javapackages-4.7.0+git20170331.ef4057e7.orig/configure
-+++ javapackages-4.7.0+git20170331.ef4057e7/configure
-@@ -83,7 +83,6 @@ test -z "${libdir}" && rpmconfigdir="${p
- test -z "${rpmconfigdir}" && rpmconfigdir="${prefix}/lib/rpm"
-
- test -z "${m2home}" && m2home="${datadir}/xmvn"
--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)
-Index: javapackages-4.7.0+git20170331.ef4057e7/install
-===================================================================
---- javapackages-4.7.0+git20170331.ef4057e7.orig/install
-+++ javapackages-4.7.0+git20170331.ef4057e7/install
-@@ -207,8 +207,3 @@ exec >files-gradle
+--- javapackages-5.0.0+git20180104.9367c8f6.orig/install
++++ javapackages-5.0.0+git20180104.9367c8f6/install
+@@ -242,8 +242,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"
@@ -33,3 +21,15 @@
-(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
+===================================================================
+--- javapackages-5.0.0+git20180104.9367c8f6.orig/configure-base.sh
++++ javapackages-5.0.0+git20180104.9367c8f6/configure-base.sh
+@@ -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=$(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)
++++++ suse-use-libdir.patch ++++++
--- /var/tmp/diff_new_pack.xQfWou/_old 2018-01-30 15:41:53.113659367 +0100
+++ /var/tmp/diff_new_pack.xQfWou/_new 2018-01-30 15:41:53.113659367 +0100
@@ -6,30 +6,10 @@
macros.d/macros.jpackage | 12 ++++++------
2 files changed, 8 insertions(+), 6 deletions(-)
-Index: javapackages-4.7.0+git20170331.ef4057e7/configure
+Index: javapackages-5.0.0+git20180104.9367c8f6/macros.d/macros.jpackage
===================================================================
---- javapackages-4.7.0+git20170331.ef4057e7.orig/configure
-+++ javapackages-4.7.0+git20170331.ef4057e7/configure
-@@ -45,6 +45,7 @@ prefix
- rundir
- sysconfdir
- rpmconfigdir
-+libdir
-
- m2home
-
-@@ -78,6 +79,7 @@ test -z "${localstatedir}" && localstate
- test -z "${mandir}" && mandir="${datadir}/man"
- test -z "${rundir}" && rundir="${localstatedir}/run"
- test -z "${sysconfdir}" && sysconfdir="${prefix}/etc"
-+test -z "${libdir}" && rpmconfigdir="${prefix}/lib/"
- test -z "${rpmconfigdir}" && rpmconfigdir="${prefix}/lib/rpm"
-
- test -z "${m2home}" && m2home="${datadir}/xmvn"
-Index: javapackages-4.7.0+git20170331.ef4057e7/macros.d/macros.jpackage
-===================================================================
---- javapackages-4.7.0+git20170331.ef4057e7.orig/macros.d/macros.jpackage
-+++ javapackages-4.7.0+git20170331.ef4057e7/macros.d/macros.jpackage
+--- javapackages-5.0.0+git20180104.9367c8f6.orig/macros.d/macros.jpackage
++++ javapackages-5.0.0+git20180104.9367c8f6/macros.d/macros.jpackage
@@ -13,17 +13,17 @@
#
# Root directory where all Java VMs/SDK/JREs are installed.
@@ -69,3 +49,23 @@
#
# 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"
+
