forked from pool/javapackages-tools
6eb3784f6b
- 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
72 lines
2.4 KiB
Diff
72 lines
2.4 KiB
Diff
Date: Sat, 7 Mar 2015 19:25:15 +0100
|
|
Subject: [PATCH] SUSE does store jvm related things in libdir
|
|
|
|
---
|
|
configure | 2 ++
|
|
macros.d/macros.jpackage | 12 ++++++------
|
|
2 files changed, 8 insertions(+), 6 deletions(-)
|
|
|
|
Index: javapackages-5.2.0+git20180620.70fa2258/configure-base.sh
|
|
===================================================================
|
|
--- 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.
|
|
#
|
|
-%_jvmdir %{_prefix}/lib/jvm
|
|
+%_jvmdir %{_libdir}/jvm
|
|
|
|
#
|
|
# Root directory for all Java VM/SDK/JRE's private things.
|
|
#
|
|
-%_jvmprivdir %{_prefix}/lib/jvm-private
|
|
+%_jvmprivdir %{_libdir}/jvm-private
|
|
|
|
#
|
|
# Root directory for all architecture dependent parts of Java VM/SDK/JRE's
|
|
#
|
|
-%_jvmlibdir %{_prefix}/lib/jvm
|
|
+%_jvmlibdir %{_libdir}/jvm
|
|
|
|
#
|
|
# Root directory for all architecture independent parts of Java VM/SDK/JRE's
|
|
@@ -38,7 +38,7 @@
|
|
#
|
|
# Root directory for all common architecture dependent parts of Java VM/SDK/JRE's
|
|
#
|
|
-%_jvmcommonlibdir %{_prefix}/lib/jvm-commmon
|
|
+%_jvmcommonlibdir %{_libdir}/jvm-commmon
|
|
|
|
#
|
|
# Root directory for all common architecture independent parts of Java VM/SDK/JRE's
|
|
@@ -64,7 +64,7 @@
|
|
#
|
|
# Directory where arch-specific (JNI) version-independent jars are installed.
|
|
#
|
|
-%_jnidir %{_prefix}/lib/java
|
|
+%_jnidir %{_libdir}/java
|
|
|
|
#
|
|
# Root directory where all javadoc is installed. Also already in RH macros.
|