1
0
javapackages-tools/suse-use-libdir.patch

94 lines
3.2 KiB
Diff
Raw Normal View History

--- javapackages-5.3.0/configure-base.sh 2018-08-06 17:09:06.000000000 +0200
+++ javapackages-5.3.0/configure-base.sh 2018-11-27 19:26:13.018127714 +0100
@@ -14,6 +14,7 @@
root_sysconfdir
rpmconfigdir
rpmmacrodir
+libdir
m2home
@@ -51,6 +52,7 @@
test -z "${rundir}" && rundir="${localstatedir}/run"
test -z "${sysconfdir}" && sysconfdir="${prefix}/etc"
test -z "${root_sysconfdir}" && root_sysconfdir="${prefix}/etc"
+test -z "${libdir}" && libdir="${prefix}/lib/"
test -z "${rpmconfigdir}" && rpmconfigdir="${prefix}/lib/rpm"
test -z "${rpmmacrodir}" && rpmmacrodir="${rpmconfigdir}/macros.d"
--- javapackages-5.3.0/etc/eclipse.conf 2018-08-06 17:09:06.000000000 +0200
+++ javapackages-5.3.0/etc/eclipse.conf 2018-11-27 19:26:58.878365817 +0100
@@ -1,7 +1,7 @@
# Eclipse filesystem configuration file
# Eclipse platform root directory
-eclipse.root=@{prefix}/lib/eclipse
+eclipse.root=@{libdir}/eclipse
# Location of architecture-independant dropins
eclipse.dropins.noarch=@{datadir}/eclipse/dropins
@@ -10,10 +10,10 @@
eclipse.droplets.noarch=@{datadir}/eclipse/droplets
# Location of architecture-dependant dropins
-eclipse.dropins.archful=@{prefix}/lib/eclipse/dropins
+eclipse.dropins.archful=@{libdir}/eclipse/dropins
# Location of architecture-dependant droplets
-eclipse.droplets.archful=@{prefix}/lib/eclipse/droplets
+eclipse.droplets.archful=@{libdir}/eclipse/droplets
# Comma-separated list of directories searched for external bundles
eclipse.bundles=@{javadir},@{jnidir}
--- javapackages-5.3.0/expand.sh 2018-08-06 17:09:06.000000000 +0200
+++ javapackages-5.3.0/expand.sh 2018-11-27 19:25:41.517964174 +0100
@@ -45,6 +45,7 @@
-e "s|@{scl_suffix}|${scl_suffix}|g" \
-e "s|@{bindir}|${bindir}|g" \
-e "s|@{datadir}|${datadir}|g" \
+ -e "s|@{libdir}|${libdir}|g" \
-e "s|@{javaconfdir}|${javaconfdir}|g" \
-e "s|@{javadir}|${javadir}|g" \
-e "s|@{jnidir}|${jnidir}|g" \
--- javapackages-5.3.0/macros.d/macros.javapackages-filesystem 2018-08-06 17:09:06.000000000 +0200
+++ javapackages-5.3.0/macros.d/macros.javapackages-filesystem 2018-11-27 19:26:13.018127714 +0100
@@ -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.