File suse-use-libdir.patch of Package javapackages-tools-extras

Overview Repositories Revisions Requests Users Attributes Meta

File suse-use-libdir.patch of Package javapackages-tools-extras (Revision 7ba24fe31eda6e44e880c9bc73a7cec4)

Currently displaying revision 7ba24fe31eda6e44e880c9bc73a7cec4 , Show latest

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.0.0+git20180104.9367c8f6/macros.d/macros.jpackage
===================================================================
--- javapackages-5.0.0+git20180104.9367c8f6.orig/macros.d/macros.jpackage
+++ javapackages-5.0.0+git20180104.9367c8f6/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    %{_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.
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
@@ -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"

Places

File suse-use-libdir.patch of Package javapackages-tools-extras (Revision 7ba24fe31eda6e44e880c9bc73a7cec4)

Places