diff --git a/_service b/_service
index e018054..1a075ed 100644
--- a/_service
+++ b/_service
@@ -4,7 +4,7 @@
git
enable
javapackages
- 4.7.0+git%cd.%h
+ 5.0.0+git%cd.%h
*.tar
diff --git a/fix-abs2rel.patch b/fix-abs2rel.patch
deleted file mode 100644
index 0c28f88..0000000
--- a/fix-abs2rel.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-Index: javapackages-4.7.0+git20170331.ef4057e7/bin/abs2rel
-===================================================================
---- javapackages-4.7.0+git20170331.ef4057e7.orig/bin/abs2rel
-+++ javapackages-4.7.0+git20170331.ef4057e7/bin/abs2rel
-@@ -1,4 +1,4 @@
--#!%{pyinterpreter}
-+#!@{pyinterpreter}
- # Copyright (c) 2017, Red Hat, Inc.
- #
- # All rights reserved.
diff --git a/javapackages-4.7.0+git20170331.ef4057e7.tar.xz b/javapackages-4.7.0+git20170331.ef4057e7.tar.xz
deleted file mode 100644
index 0ecbf1c..0000000
--- a/javapackages-4.7.0+git20170331.ef4057e7.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:65fb48922717262330b2038977e1fa0b0379d8d9038b8f9c9941e6546e515424
-size 116300
diff --git a/javapackages-5.0.0+git20180104.9367c8f6.tar.xz b/javapackages-5.0.0+git20180104.9367c8f6.tar.xz
new file mode 100644
index 0000000..828b6ec
--- /dev/null
+++ b/javapackages-5.0.0+git20180104.9367c8f6.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:670722d9bd53622a73b9a41312bf965601ced2bca5ea17bfa9afb758173a15fc
+size 118040
diff --git a/javapackages-tools-extras.changes b/javapackages-tools-extras.changes
index 7bb8b3e..469472e 100644
--- a/javapackages-tools-extras.changes
+++ b/javapackages-tools-extras.changes
@@ -1,3 +1,22 @@
+-------------------------------------------------------------------
+Mon Jan 22 09:31:20 UTC 2018 - tchvatal@suse.com
+
+- 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
+
-------------------------------------------------------------------
Wed May 24 13:39:01 UTC 2017 - tchvatal@suse.com
diff --git a/javapackages-tools-extras.spec b/javapackages-tools-extras.spec
index 3db1bc8..a6cc6c3 100644
--- a/javapackages-tools-extras.spec
+++ b/javapackages-tools-extras.spec
@@ -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 @@ Source: javapackages-%{version}.tar.xz
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 @@ This package provides non-essential macros and scripts to support Java packaging
%build
%configure \
%if %{with python}
- --pyinterpreter=/usr/bin/python3
+ --pyinterpreter=%{_bindir}/python3
%else
--pyinterpreter=%{nil}
%endif
@@ -144,6 +142,7 @@ files="
%{_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 @@ rm -rf %{buildroot}%{_datadir}/fedora-review/
%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
diff --git a/javapackages-tools.changes b/javapackages-tools.changes
index 7bb8b3e..469472e 100644
--- a/javapackages-tools.changes
+++ b/javapackages-tools.changes
@@ -1,3 +1,22 @@
+-------------------------------------------------------------------
+Mon Jan 22 09:31:20 UTC 2018 - tchvatal@suse.com
+
+- 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
+
-------------------------------------------------------------------
Wed May 24 13:39:01 UTC 2017 - tchvatal@suse.com
diff --git a/javapackages-tools.spec b/javapackages-tools.spec
index a285b9f..d6788af 100644
--- a/javapackages-tools.spec
+++ b/javapackages-tools.spec
@@ -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 @@ Source: javapackages-%{version}.tar.xz
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 @@ This package provides non-essential macros and scripts to support Java packaging
%build
%configure \
%if %{with python}
- --pyinterpreter=/usr/bin/python3
+ --pyinterpreter=%{_bindir}/python3
%else
--pyinterpreter=%{nil}
%endif
@@ -144,6 +142,7 @@ files="
%{_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 @@ rm -rf %{buildroot}%{_datadir}/fedora-review/
%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
diff --git a/python-optional.patch b/python-optional.patch
index 035f489..921188c 100644
--- a/python-optional.patch
+++ b/python-optional.patch
@@ -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 @@ Index: javapackages-4.7.0+git20170331.ef4057e7/install
-(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)
diff --git a/suse-use-libdir.patch b/suse-use-libdir.patch
index 15d0c0a..a8e72c4 100644
--- a/suse-use-libdir.patch
+++ b/suse-use-libdir.patch
@@ -6,30 +6,10 @@ Subject: [PATCH] SUSE does store jvm related things in libdir
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 @@ Index: javapackages-4.7.0+git20170331.ef4057e7/macros.d/macros.jpackage
#
# 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"
+