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

- Switch to multibuild layout

Browse Source 
- Update to version 5.0.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

OBS-URL: https://build.opensuse.org/package/show/Java:packages/javapackages-tools?expand=0&rev=45
This commit is contained in:
Tomáš Chvátal
2018-07-24 14:28:42 +00:00
committed by Git OBS Bridge
parent 5cc9d29b0d
commit 6eb3784f6b
11 changed files with 88 additions and 449 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
python-optional.patch
View File

@@ -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 @@ Index: javapackages-5.0.0+git20180104.9367c8f6/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
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 @@ Index: javapackages-5.0.0+git20180104.9367c8f6/configure-base.sh
-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)