java-packages/javapackages-tools
SHA256
7
0
Fork 0
forked from pool/javapackages-tools
Code Pull Requests Activity

- Update to version 5.0.0+git20180104.9367c8f6:

Browse Source 
* [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

- 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

OBS-URL: https://build.opensuse.org/package/show/Java:packages/javapackages-tools?expand=0&rev=43
This commit is contained in:
Tomáš Chvátal
2018-01-22 09:49:59 +00:00
committed by Git OBS Bridge
parent c1b58de147
commit 5cc9d29b0d
10 changed files with 93 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
python-optional.patch
View File

@@ -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)