forked from pool/javapackages-tools
fe76c21721
* Reimplement abs2rel in Python
* Don't expand {scl} in macro definitions
* Install expanded rpmfc attr files
* [spec] Avoid file conflicts between in SCL
* Fix macros.d directory ownership
* Make %ant macro enable SCL when needed
* [spec] Fix file conflicts between SCL and non-SCL packages
* Fix ownership of ivyxmldir
* [test] Force locale for python processes
* Don't include timestamp in generated pom.properties
- Remove patch suse-macros-install-location.patch
* We switch to /usr/lib/ location for macros
- Refresh patch suse-use-libdir.patch
OBS-URL: https://build.opensuse.org/package/show/Java:packages/javapackages-tools?expand=0&rev=33
72 lines
2.2 KiB
Diff
72 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(-)
|
|
|
|
Index: javapackages-4.7.0+git20170331.ef4057e7/configure
|
|
===================================================================
|
|
--- 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
|
|
@@ -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 %{_lbidir}/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.
|