forked from pool/javapackages-tools
6783b53ef7
- Drop patches * depgen.patch * javapackages-2.0.1-fix-bashisms.patch * javapackages-2.0.1-java9.patch * maven_depmap-no-attribute-exit.patch - Remove hacky workarounds - Fix rpmlint errors - Enable maven-local - Avoid unsatisfiable dependencies - Enable unit tests - Update to version 4.4.0 OBS-URL: https://build.opensuse.org/request/show/289830 OBS-URL: https://build.opensuse.org/package/show/Java:packages/javapackages-tools?expand=0&rev=20
81 lines
2.2 KiB
Diff
81 lines
2.2 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(-)
|
|
|
|
diff --git a/configure b/configure
|
|
index da2fd40..54935ce 100755
|
|
--- a/configure
|
|
+++ b/configure
|
|
@@ -41,6 +41,7 @@ prefix
|
|
rundir
|
|
sysconfdir
|
|
rpmconfigdir
|
|
+libdir
|
|
|
|
m2home
|
|
|
|
@@ -76,6 +77,7 @@ 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 "${libdir}" && rpmconfigdir="${prefix}/lib/"
|
|
test -z "${rpmconfigdir}" && rpmconfigdir="${prefix}/lib/rpm"
|
|
|
|
test -z "${m2home}" && m2home="${datadir}/xmvn"
|
|
diff --git a/macros.d/macros.jpackage b/macros.d/macros.jpackage
|
|
index 62d2dc1..75a5ba3 100644
|
|
--- a/macros.d/macros.jpackage
|
|
+++ b/macros.d/macros.jpackage
|
|
@@ -13,22 +13,22 @@
|
|
#
|
|
# Root directory where all Java VMs/SDK/JREs are installed.
|
|
#
|
|
-%_jvmdir %{_prefix}/lib/jvm
|
|
+%_jvmdir %{_libdir}/jvm
|
|
|
|
#
|
|
# Root directory where all Java VMs/SDK/JREs expose their jars
|
|
#
|
|
-%_jvmjardir %{_prefix}/lib/jvm-exports
|
|
+%_jvmjardir %{_libdir}/jvm-exports
|
|
|
|
#
|
|
# 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
|
|
@@ -43,7 +43,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
|
|
@@ -86,7 +86,7 @@
|
|
# - jars for Java standard x.y.z (usually symlinks to %{_jnidir}-ext)
|
|
# To simplify things only %{_jnidir} is defined.
|
|
#
|
|
-%_jnidir %{_prefix}/lib/java
|
|
+%_jnidir %{_libdir}/java
|
|
|
|
#
|
|
# Root directory where all javadoc is installed. Also already in RH macros.
|
|
--
|
|
2.1.4
|
|
|