rpm/javapackages-tools
SHA256
1
0
Fork 0
forked from pool/javapackages-tools
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/Java:packages/javapackages-tools?expand=0&rev=56

Browse Source
This commit is contained in:
Fridrich Strba 2018-11-27 18:37:35 +00:00 committed by Git OBS Bridge
parent 1647441067
commit 13145b6fb9
2 changed files with 48 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
javapackages-tools.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Nov 27 18:36:57 UTC 2018 - Fridrich Strba <fstrba@suse.com>
- Modified patch:
* suse-use-libdir.patch
+ fix directories for eclipse.conf too
-------------------------------------------------------------------
Sun Nov 11 15:21:24 UTC 2018 - Fridrich Strba <fstrba@suse.com>

60
suse-use-libdir.patch
View File

@ -1,16 +1,6 @@
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
--- 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
@ -18,18 +8,50 @@ Index: javapackages-5.2.0+git20180620.70fa2258/configure-base.sh
m2home
@@ -51,6 +52,7 @@ test -z "${mandir}" && mandir="${datadir
@@ -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}" && rpmconfigdir="${prefix}/lib/"
+test -z "${libdir}" && libdir="${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
--- 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.