89a5cdc5eb
* Fix creation of artifact aliases, resolves: rhbz#988462 - Update to upstream version 2.0.0 * Merge functionality of jpackage-utils * Provide and obsolete jpackage-utils * %%add_maven_depmap macro now injects pom.properties to every JAR * %%add_to_maven_depmap and %%update_maven_depmap macros were removed * maven2jpp-mapdeps.xsl template has been removed * Macros related to installation of icons and desktop files were removed * 14 new manual pages were added * Documentation specific to JPackage was removed * Add BuildRequires: asciidoc, xmlto * Add lua to Requires * Add python-xml to Requires for xml.dom.minidom OBS-URL: https://build.opensuse.org/package/show/Java:packages/javapackages-tools?expand=0&rev=6
75 lines
2.2 KiB
Diff
75 lines
2.2 KiB
Diff
---
|
|
configure | 2 ++
|
|
etc/macros.jpackage | 12 ++++++------
|
|
2 files changed, 8 insertions(+), 6 deletions(-)
|
|
|
|
Index: javapackages-2.0.1/etc/macros.jpackage
|
|
===================================================================
|
|
--- javapackages-2.0.1.orig/etc/macros.jpackage
|
|
+++ javapackages-2.0.1/etc/macros.jpackage
|
|
@@ -13,22 +13,22 @@
|
|
#
|
|
# Root directory where all Java VMs/SDK/JREs are installed.
|
|
#
|
|
-%_jvmdir %{_prefix}/lib/jvm
|
|
+%_jvmdir %{_libdir}/jvm
|
|
|
|
#
|
|
# Root directory where all Java VMs/SDK/JREs expose their jars
|
|
#
|
|
-%_jvmjardir %{_prefix}/lib/jvm-exports
|
|
+%_jvmjardir %{_libdir}/jvm-exports
|
|
|
|
#
|
|
# 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
|
|
@@ -43,7 +43,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
|
|
@@ -81,7 +81,7 @@
|
|
# - jars for Java standard x.y.z (usually symlinks to %{_jnidir}-ext)
|
|
# To simplify things only %{_jnidir} is defined.
|
|
#
|
|
-%_jnidir %{_prefix}/lib/java
|
|
+%_jnidir %{_libdir}/java
|
|
|
|
#
|
|
# Root directory where all javadoc is installed. Also already in RH macros.
|
|
Index: javapackages-2.0.1/configure
|
|
===================================================================
|
|
--- javapackages-2.0.1.orig/configure
|
|
+++ javapackages-2.0.1/configure
|
|
@@ -39,6 +39,7 @@ mandir
|
|
prefix
|
|
sysconfdir
|
|
rpmconfigdir
|
|
+libdir
|
|
|
|
javadir
|
|
javadocdir
|
|
@@ -68,6 +69,7 @@ test -z "${datadir}" && datadir="${prefi
|
|
test -z "${mandir}" && mandir="${datadir}/man"
|
|
test -z "${sysconfdir}" && sysconfdir="${prefix}/etc"
|
|
test -z "${rpmconfigdir}" && rpmconfigdir="${prefix}/lib/rpm"
|
|
+test -z "${libdir}" && libdir="${prefix}/lib"
|
|
|
|
eval $(sed -n 's/^%_\('"$vars_re"'\)\ *\(.*\)$/\1="\2"/;T;s/%{_\(.*}\)/${\1/;p' etc/macros.jpackage)
|
|
|