pool/javapackages-tools
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Fridrich Strba 2018-11-28 05:37:07 +00:00 committed by Git OBS Bridge
parent 13145b6fb9
commit 8af2991345
1 changed files with 42 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
suse-use-libdir.patch
View File

@ -1,5 +1,5 @@
--- 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
+++ javapackages-5.3.0/configure-base.sh 2018-11-28 06:33:58.811049137 +0100
@@ -14,6 +14,7 @@
root_sysconfdir
rpmconfigdir
@ -17,7 +17,7 @@
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
+++ javapackages-5.3.0/etc/eclipse.conf 2018-11-28 06:33:58.811049137 +0100
@@ -1,7 +1,7 @@
# Eclipse filesystem configuration file
@ -41,7 +41,7 @@
# 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
+++ javapackages-5.3.0/expand.sh 2018-11-28 06:33:58.811049137 +0100
@@ -45,6 +45,7 @@
-e "s|@{scl_suffix}|${scl_suffix}|g" \
-e "s|@{bindir}|${bindir}|g" \
@ -50,8 +50,27 @@
-e "s|@{javaconfdir}|${javaconfdir}|g" \
-e "s|@{javadir}|${javadir}|g" \
-e "s|@{jnidir}|${jnidir}|g" \
--- javapackages-5.3.0/install 2018-08-06 17:09:06.000000000 +0200
+++ javapackages-5.3.0/install 2018-11-28 06:36:39.927862680 +0100
@@ -90,11 +90,11 @@
dir "${mavenpomdir}"
dir "${ivyxmldir}"
dir "${datadir}/maven-metadata"
-dir "${prefix}/lib/eclipse"
-dir "${prefix}/lib/eclipse/features"
-dir "${prefix}/lib/eclipse/plugins"
-dir "${prefix}/lib/eclipse/dropins"
-dir "${prefix}/lib/eclipse/droplets"
+dir "${libdir}/eclipse"
+dir "${libdir}/eclipse/features"
+dir "${libdir}/eclipse/plugins"
+dir "${libdir}/eclipse/dropins"
+dir "${libdir}/eclipse/droplets"
dir "${datadir}/eclipse"
dir "${datadir}/eclipse/dropins"
dir "${datadir}/eclipse/droplets"
--- 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
+++ javapackages-5.3.0/macros.d/macros.javapackages-filesystem 2018-11-28 06:33:58.811049137 +0100
@@ -13,17 +13,17 @@
#
# Root directory where all Java VMs/SDK/JREs are installed.
@ -91,3 +110,22 @@
#
# Root directory where all javadoc is installed. Also already in RH macros.
--- javapackages-5.3.0/macros.d/macros.scl-java-template 2018-08-06 17:09:06.000000000 +0200
+++ javapackages-5.3.0/macros.d/macros.scl-java-template 2018-11-28 06:34:48.631301258 +0100
@@ -50,11 +50,11 @@
dir "%{_ivyxmldir}" \
dir "%{_sysconfdir}/ivy" \
dir "%{_datadir}/maven-metadata" \
- dir "%{_prefix}/lib/eclipse" \
- dir "%{_prefix}/lib/eclipse/features" \
- dir "%{_prefix}/lib/eclipse/plugins" \
- dir "%{_prefix}/lib/eclipse/dropins" \
- dir "%{_prefix}/lib/eclipse/droplets" \
+ dir "%{_libdir}/eclipse" \
+ dir "%{_libdir}/eclipse/features" \
+ dir "%{_libdir}/eclipse/plugins" \
+ dir "%{_libdir}/eclipse/dropins" \
+ dir "%{_libdir}/eclipse/droplets" \
dir "%{_datadir}/eclipse" \
dir "%{_datadir}/eclipse/dropins" \
dir "%{_datadir}/eclipse/droplets" \