pool/javapackages-tools
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5cc9d29b0d
javapackages-tools/suse-use-libdir.patch

72 lines
2.3 KiB
Diff
Raw Normal View History

Accepting request 289830 from home:Mailaender:branches:Java:packages - Drop patches * depgen.patch * javapackages-2.0.1-fix-bashisms.patch * javapackages-2.0.1-java9.patch * maven_depmap-no-attribute-exit.patch - Remove hacky workarounds - Fix rpmlint errors - Enable maven-local - Avoid unsatisfiable dependencies - Enable unit tests - Update to version 4.4.0 OBS-URL: https://build.opensuse.org/request/show/289830 OBS-URL: https://build.opensuse.org/package/show/Java:packages/javapackages-tools?expand=0&rev=20
2015-03-16 17:26:42 +01:00
Date: Sat, 7 Mar 2015 19:25:15 +0100
Subject: [PATCH] SUSE does store jvm related things in libdir
- update to 2.0.1 * 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
2013-08-22 10:59:39 +02:00
---
Accepting request 289830 from home:Mailaender:branches:Java:packages - Drop patches * depgen.patch * javapackages-2.0.1-fix-bashisms.patch * javapackages-2.0.1-java9.patch * maven_depmap-no-attribute-exit.patch - Remove hacky workarounds - Fix rpmlint errors - Enable maven-local - Avoid unsatisfiable dependencies - Enable unit tests - Update to version 4.4.0 OBS-URL: https://build.opensuse.org/request/show/289830 OBS-URL: https://build.opensuse.org/package/show/Java:packages/javapackages-tools?expand=0&rev=20
2015-03-16 17:26:42 +01:00
configure | 2 ++
macros.d/macros.jpackage | 12 ++++++------
- update to 2.0.1 * 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
2013-08-22 10:59:39 +02:00
2 files changed, 8 insertions(+), 6 deletions(-)
- Update to version 5.0.0+git20180104.9367c8f6: * [java-functions] Avoid colons in jar names * Workaround for SCL enable scripts not working with -e * Second argument to pom_xpath_inject is mandatory * [mvn_artifact] Provide more helpful error messages * Fix traceback on corrupt zipfile * [test] Add reproducer for rhbz#1481005 * [spec] Fix default JRE path * [readme] Fix typo * Add initial content to README.md (#21) * Decouple JAVA_HOME setting from java command alternatives - Rebase patches: * python-optional.patch * suse-use-libdir.patch - Drop merged patch fix-abs2rel.patch - Update to version 5.0.0+git20180104.9367c8f6: * [java-functions] Avoid colons in jar names * Workaround for SCL enable scripts not working with -e * Second argument to pom_xpath_inject is mandatory * [mvn_artifact] Provide more helpful error messages * Fix traceback on corrupt zipfile * [test] Add reproducer for rhbz#1481005 * [spec] Fix default JRE path * [readme] Fix typo * Add initial content to README.md (#21) * Decouple JAVA_HOME setting from java command alternatives - Rebase patches: * python-optional.patch * suse-use-libdir.patch OBS-URL: https://build.opensuse.org/package/show/Java:packages/javapackages-tools?expand=0&rev=43
2018-01-22 10:49:59 +01:00
Index: javapackages-5.0.0+git20180104.9367c8f6/macros.d/macros.jpackage
- Update to version 4.7.0+git20170331.ef4057e7: * Reimplement abs2rel in Python * Don't expand {scl} in macro definitions * Install expanded rpmfc attr files * [spec] Avoid file conflicts between in SCL * Fix macros.d directory ownership * Make %ant macro enable SCL when needed * [spec] Fix file conflicts between SCL and non-SCL packages * Fix ownership of ivyxmldir * [test] Force locale for python processes * Don't include timestamp in generated pom.properties - Remove patch suse-macros-install-location.patch * We switch to /usr/lib/ location for macros - Refresh patch suse-use-libdir.patch OBS-URL: https://build.opensuse.org/package/show/Java:packages/javapackages-tools?expand=0&rev=33
2017-05-18 21:51:04 +02:00
===================================================================
- Update to version 5.0.0+git20180104.9367c8f6: * [java-functions] Avoid colons in jar names * Workaround for SCL enable scripts not working with -e * Second argument to pom_xpath_inject is mandatory * [mvn_artifact] Provide more helpful error messages * Fix traceback on corrupt zipfile * [test] Add reproducer for rhbz#1481005 * [spec] Fix default JRE path * [readme] Fix typo * Add initial content to README.md (#21) * Decouple JAVA_HOME setting from java command alternatives - Rebase patches: * python-optional.patch * suse-use-libdir.patch - Drop merged patch fix-abs2rel.patch - Update to version 5.0.0+git20180104.9367c8f6: * [java-functions] Avoid colons in jar names * Workaround for SCL enable scripts not working with -e * Second argument to pom_xpath_inject is mandatory * [mvn_artifact] Provide more helpful error messages * Fix traceback on corrupt zipfile * [test] Add reproducer for rhbz#1481005 * [spec] Fix default JRE path * [readme] Fix typo * Add initial content to README.md (#21) * Decouple JAVA_HOME setting from java command alternatives - Rebase patches: * python-optional.patch * suse-use-libdir.patch OBS-URL: https://build.opensuse.org/package/show/Java:packages/javapackages-tools?expand=0&rev=43
2018-01-22 10:49:59 +01:00
--- javapackages-5.0.0+git20180104.9367c8f6.orig/macros.d/macros.jpackage
+++ javapackages-5.0.0+git20180104.9367c8f6/macros.d/macros.jpackage
- Update to version 4.7.0+git20170331.ef4057e7: * Reimplement abs2rel in Python * Don't expand {scl} in macro definitions * Install expanded rpmfc attr files * [spec] Avoid file conflicts between in SCL * Fix macros.d directory ownership * Make %ant macro enable SCL when needed * [spec] Fix file conflicts between SCL and non-SCL packages * Fix ownership of ivyxmldir * [test] Force locale for python processes * Don't include timestamp in generated pom.properties - Remove patch suse-macros-install-location.patch * We switch to /usr/lib/ location for macros - Refresh patch suse-use-libdir.patch OBS-URL: https://build.opensuse.org/package/show/Java:packages/javapackages-tools?expand=0&rev=33
2017-05-18 21:51:04 +02:00
@@ -13,17 +13,17 @@
- update to 2.0.1 * 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
2013-08-22 10:59:39 +02:00
#
# 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
- Fix typo in suse-use-libdir.patch - Fix typo in suse-use-libdir.patch OBS-URL: https://build.opensuse.org/package/show/Java:packages/javapackages-tools?expand=0&rev=41
2017-05-24 15:38:06 +02:00
+%_jvmprivdir %{_libdir}/jvm-private
- update to 2.0.1 * 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
2013-08-22 10:59:39 +02:00
#
# 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
- Update to version 4.7.0+git20170331.ef4057e7: * Reimplement abs2rel in Python * Don't expand {scl} in macro definitions * Install expanded rpmfc attr files * [spec] Avoid file conflicts between in SCL * Fix macros.d directory ownership * Make %ant macro enable SCL when needed * [spec] Fix file conflicts between SCL and non-SCL packages * Fix ownership of ivyxmldir * [test] Force locale for python processes * Don't include timestamp in generated pom.properties - Remove patch suse-macros-install-location.patch * We switch to /usr/lib/ location for macros - Refresh patch suse-use-libdir.patch OBS-URL: https://build.opensuse.org/package/show/Java:packages/javapackages-tools?expand=0&rev=33
2017-05-18 21:51:04 +02:00
@@ -38,7 +38,7 @@
- update to 2.0.1 * 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
2013-08-22 10:59:39 +02:00
#
# 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
- Update to version 4.7.0+git20170331.ef4057e7: * Reimplement abs2rel in Python * Don't expand {scl} in macro definitions * Install expanded rpmfc attr files * [spec] Avoid file conflicts between in SCL * Fix macros.d directory ownership * Make %ant macro enable SCL when needed * [spec] Fix file conflicts between SCL and non-SCL packages * Fix ownership of ivyxmldir * [test] Force locale for python processes * Don't include timestamp in generated pom.properties - Remove patch suse-macros-install-location.patch * We switch to /usr/lib/ location for macros - Refresh patch suse-use-libdir.patch OBS-URL: https://build.opensuse.org/package/show/Java:packages/javapackages-tools?expand=0&rev=33
2017-05-18 21:51:04 +02:00
@@ -64,7 +64,7 @@
#
# Directory where arch-specific (JNI) version-independent jars are installed.
- update to 2.0.1 * 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
2013-08-22 10:59:39 +02:00
#
-%_jnidir %{_prefix}/lib/java
+%_jnidir %{_libdir}/java
#
# Root directory where all javadoc is installed. Also already in RH macros.
- Update to version 5.0.0+git20180104.9367c8f6: * [java-functions] Avoid colons in jar names * Workaround for SCL enable scripts not working with -e * Second argument to pom_xpath_inject is mandatory * [mvn_artifact] Provide more helpful error messages * Fix traceback on corrupt zipfile * [test] Add reproducer for rhbz#1481005 * [spec] Fix default JRE path * [readme] Fix typo * Add initial content to README.md (#21) * Decouple JAVA_HOME setting from java command alternatives - Rebase patches: * python-optional.patch * suse-use-libdir.patch - Drop merged patch fix-abs2rel.patch - Update to version 5.0.0+git20180104.9367c8f6: * [java-functions] Avoid colons in jar names * Workaround for SCL enable scripts not working with -e * Second argument to pom_xpath_inject is mandatory * [mvn_artifact] Provide more helpful error messages * Fix traceback on corrupt zipfile * [test] Add reproducer for rhbz#1481005 * [spec] Fix default JRE path * [readme] Fix typo * Add initial content to README.md (#21) * Decouple JAVA_HOME setting from java command alternatives - Rebase patches: * python-optional.patch * suse-use-libdir.patch OBS-URL: https://build.opensuse.org/package/show/Java:packages/javapackages-tools?expand=0&rev=43
2018-01-22 10:49:59 +01:00
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"
Reference in New Issue Copy Permalink