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

Accepting request 821264 from Java:packages

Browse Source 
3.5.1

OBS-URL: https://build.opensuse.org/request/show/821264
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/javapackages-tools?expand=0&rev=23
This commit is contained in:
Dominique Leuenberger 2020-07-17 18:44:17 +00:00 committed by Git OBS Bridge
commit 4c1220ba43
5 changed files with 28 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
5.3.0.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:73803877c26b3e6c0440b2e1e4d78a5fadf63782a62374df400b8badb1de3046
size 155460

3
5.3.1.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3c2cbead4299ae4e4d0303f5f3d132754f06fd7e6d07526cea3cf992af2d15aa
size 155512

9
javapackages-tools.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Thu Jul 16 07:23:37 UTC 2020 - Fridrich Strba <fstrba@suse.com>
- Upgrade to version 5.3.1
- Modified patch:
* suse-use-libdir.patch
+ rediff to changed context
- Define _rpmmacrodir for distributions that don't have it
------------------------------------------------------------------- -------------------------------------------------------------------
Tue May 5 12:32:03 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org> Tue May 5 12:32:03 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org>

3
javapackages-tools.spec
View File

@ -16,6 +16,7 @@
# #
%{!?_rpmmacrodir:%global _rpmmacrodir %{_rpmconfigdir}/macros.d}
%global flavor @BUILD_FLAVOR@%{nil} %global flavor @BUILD_FLAVOR@%{nil}
%if "%{flavor}" == "extras" %if "%{flavor}" == "extras"
%bcond_without python %bcond_without python
@ -27,7 +28,7 @@ Name: javapackages-tools-%{flavor}
%else %else
Name: javapackages-tools Name: javapackages-tools
%endif %endif
Version: 5.3.0 Version: 5.3.1
Release: 0 Release: 0
Summary: Macros and scripts for Java packaging support Summary: Macros and scripts for Java packaging support
License: BSD-3-Clause License: BSD-3-Clause

27
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.1/configure-base.sh 2019-06-14 12:26:27.000000000 +0200
+++ javapackages-5.3.0/configure-base.sh 2018-11-28 06:33:58.811049137 +0100 +++ javapackages-5.3.1/configure-base.sh 2020-07-16 09:04:37.316453132 +0200
@@ -14,6 +14,7 @@ @@ -14,6 +14,7 @@
root_sysconfdir root_sysconfdir
rpmconfigdir rpmconfigdir
@ -16,8 +16,9 @@
test -z "${rpmconfigdir}" && rpmconfigdir="${prefix}/lib/rpm" test -z "${rpmconfigdir}" && rpmconfigdir="${prefix}/lib/rpm"
test -z "${rpmmacrodir}" && rpmmacrodir="${rpmconfigdir}/macros.d" test -z "${rpmmacrodir}" && rpmmacrodir="${rpmconfigdir}/macros.d"
--- javapackages-5.3.0/etc/eclipse.conf 2018-08-06 17:09:06.000000000 +0200 diff -urEbwB javapackages-5.3.1/etc/eclipse.conf javapackages-5.3.1/etc/eclipse.conf
+++ javapackages-5.3.0/etc/eclipse.conf 2018-11-28 06:33:58.811049137 +0100 --- javapackages-5.3.1/etc/eclipse.conf 2019-06-14 12:26:27.000000000 +0200
+++ javapackages-5.3.1/etc/eclipse.conf 2020-07-16 09:04:37.316453132 +0200
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
# Eclipse filesystem configuration file # Eclipse filesystem configuration file
@ -40,8 +41,8 @@
# Comma-separated list of directories searched for external bundles # Comma-separated list of directories searched for external bundles
eclipse.bundles=@{javadir},@{jnidir} eclipse.bundles=@{javadir},@{jnidir}
--- javapackages-5.3.0/expand.sh 2018-08-06 17:09:06.000000000 +0200 --- javapackages-5.3.1/expand.sh 2019-06-14 12:26:27.000000000 +0200
+++ javapackages-5.3.0/expand.sh 2018-11-28 06:33:58.811049137 +0100 +++ javapackages-5.3.1/expand.sh 2020-07-16 09:04:37.316453132 +0200
@@ -45,6 +45,7 @@ @@ -45,6 +45,7 @@
-e "s|@{scl_suffix}|${scl_suffix}|g" \ -e "s|@{scl_suffix}|${scl_suffix}|g" \
-e "s|@{bindir}|${bindir}|g" \ -e "s|@{bindir}|${bindir}|g" \
@ -50,8 +51,8 @@
-e "s|@{javaconfdir}|${javaconfdir}|g" \ -e "s|@{javaconfdir}|${javaconfdir}|g" \
-e "s|@{javadir}|${javadir}|g" \ -e "s|@{javadir}|${javadir}|g" \
-e "s|@{jnidir}|${jnidir}|g" \ -e "s|@{jnidir}|${jnidir}|g" \
--- javapackages-5.3.0/install 2018-08-06 17:09:06.000000000 +0200 --- javapackages-5.3.1/install 2019-06-14 12:26:27.000000000 +0200
+++ javapackages-5.3.0/install 2018-11-28 06:36:39.927862680 +0100 +++ javapackages-5.3.1/install 2020-07-16 09:04:37.316453132 +0200
@@ -90,11 +90,11 @@ @@ -90,11 +90,11 @@
dir "${mavenpomdir}" dir "${mavenpomdir}"
dir "${ivyxmldir}" dir "${ivyxmldir}"
@ -69,8 +70,8 @@
dir "${datadir}/eclipse" dir "${datadir}/eclipse"
dir "${datadir}/eclipse/dropins" dir "${datadir}/eclipse/dropins"
dir "${datadir}/eclipse/droplets" dir "${datadir}/eclipse/droplets"
--- javapackages-5.3.0/macros.d/macros.javapackages-filesystem 2018-08-06 17:09:06.000000000 +0200 --- javapackages-5.3.1/macros.d/macros.javapackages-filesystem 2019-06-14 12:26:27.000000000 +0200
+++ javapackages-5.3.0/macros.d/macros.javapackages-filesystem 2018-11-28 06:33:58.811049137 +0100 +++ javapackages-5.3.1/macros.d/macros.javapackages-filesystem 2020-07-16 09:05:34.448792440 +0200
@@ -13,17 +13,17 @@ @@ -13,17 +13,17 @@
# #
# Root directory where all Java VMs/SDK/JREs are installed. # Root directory where all Java VMs/SDK/JREs are installed.
@ -96,7 +97,7 @@
# #
# Root directory for all common architecture dependent parts of Java VM/SDK/JRE's # Root directory for all common architecture dependent parts of Java VM/SDK/JRE's
# #
-%_jvmcommonlibdir %{_prefix}/lib/jvm-commmon -%_jvmcommonlibdir %{_prefix}/lib/jvm-common
+%_jvmcommonlibdir %{_libdir}/jvm-commmon +%_jvmcommonlibdir %{_libdir}/jvm-commmon
# #
@ -110,8 +111,8 @@
# #
# Root directory where all javadoc is installed. Also already in RH macros. # 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.1/macros.d/macros.scl-java-template 2019-06-14 12:26:27.000000000 +0200
+++ javapackages-5.3.0/macros.d/macros.scl-java-template 2018-11-28 06:34:48.631301258 +0100 +++ javapackages-5.3.1/macros.d/macros.scl-java-template 2020-07-16 09:04:37.320453154 +0200
@@ -50,11 +50,11 @@ @@ -50,11 +50,11 @@
dir "%{_ivyxmldir}" \ dir "%{_ivyxmldir}" \
dir "%{_sysconfdir}/ivy" \ dir "%{_sysconfdir}/ivy" \