From 2ac9bdc670344963b029271adc04fad414575718b5ee9d9febfa6ea2f36a5414 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 25 Nov 2019 11:17:44 +0000 Subject: [PATCH 1/4] Temporarily disable xmvn-subst in order to fix incompatibility with system libraries OBS-URL: https://build.opensuse.org/package/show/Java:packages/gradle-bootstrap?expand=0&rev=6 --- gradle-bootstrap.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gradle-bootstrap.spec b/gradle-bootstrap.spec index c820182..a9d4a44 100644 --- a/gradle-bootstrap.spec +++ b/gradle-bootstrap.spec @@ -1,7 +1,7 @@ # # spec file for package gradle-bootstrap # -# Copyright (c) 2019 SUSE LLC. +# Copyright (c) 2019 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -315,8 +315,8 @@ install -p -m 755 gradle.sh %{buildroot}%{_bindir}/%{short_name} install -d -m 755 %{buildroot}%{_mandir}/man1/ install -p -m 644 man/%{short_name}.1 %{buildroot}%{_mandir}/man1/%{short_name}.1 -xmvn-subst $(find %{buildroot}%{_datadir}/%{short_name} -type f -name \*.jar) -xmvn-subst -R %{buildroot} $(find %{buildroot}%{_datadir}/%{short_name} -type f -name \*.jar) +#xmvn-subst $(find %{buildroot}%{_datadir}/%{short_name} -type f -name \*.jar) +#xmvn-subst -R %{buildroot} $(find %{buildroot}%{_datadir}/%{short_name} -type f -name \*.jar) %files -f .mfiles %{_bindir}/%{short_name} From 27879b3317ac3fdebaa12df7d59f8b49f40eb01429a420f8ac58f382abc789fd Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 28 Nov 2019 07:45:47 +0000 Subject: [PATCH 2/4] OBS-URL: https://build.opensuse.org/package/show/Java:packages/gradle-bootstrap?expand=0&rev=8 --- gpars.jar | 2 +- gradle-4.4.1-built.tar.xz | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gpars.jar b/gpars.jar index 9780be0..649d825 100644 --- a/gpars.jar +++ b/gpars.jar @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b1720e7d5a2f3ce420a6b35cc2410e8ee5db50ab924424e7d5b1602e8c66668a +oid sha256:2f6902e9f53379996e200acf072295827e5d56088d9f34ce9181fde0243105c7 size 633259 diff --git a/gradle-4.4.1-built.tar.xz b/gradle-4.4.1-built.tar.xz index 8be33c0..c589447 100644 --- a/gradle-4.4.1-built.tar.xz +++ b/gradle-4.4.1-built.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dc04d599d4596501169cd62206066006d6b318b9080d2ab6b5450c0bb784bef1 -size 50161496 +oid sha256:55d35382ff60d5433b2e4cbad45d76b511db28253c7514fb8c4096e6516feca8 +size 50077852 From 5c711b0c09d99d22632e13135d87d9257b9b2746aeda99d1e98d42537f466137 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 28 Nov 2019 07:48:11 +0000 Subject: [PATCH 3/4] OBS-URL: https://build.opensuse.org/package/show/Java:packages/gradle-bootstrap?expand=0&rev=9 --- gradle-bootstrap.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle-bootstrap.spec b/gradle-bootstrap.spec index a9d4a44..a737736 100644 --- a/gradle-bootstrap.spec +++ b/gradle-bootstrap.spec @@ -315,8 +315,8 @@ install -p -m 755 gradle.sh %{buildroot}%{_bindir}/%{short_name} install -d -m 755 %{buildroot}%{_mandir}/man1/ install -p -m 644 man/%{short_name}.1 %{buildroot}%{_mandir}/man1/%{short_name}.1 -#xmvn-subst $(find %{buildroot}%{_datadir}/%{short_name} -type f -name \*.jar) -#xmvn-subst -R %{buildroot} $(find %{buildroot}%{_datadir}/%{short_name} -type f -name \*.jar) +xmvn-subst $(find %{buildroot}%{_datadir}/%{short_name} -type f -name \*.jar) +xmvn-subst -R %{buildroot} $(find %{buildroot}%{_datadir}/%{short_name} -type f -name \*.jar) %files -f .mfiles %{_bindir}/%{short_name} From 5ad2587acc433355263d24b8ef6184439c4a9882b59f1747521cdc98edf79137 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 28 Nov 2019 08:47:18 +0000 Subject: [PATCH 4/4] OBS-URL: https://build.opensuse.org/package/show/Java:packages/gradle-bootstrap?expand=0&rev=10 --- gradle-bootstrap.changes | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/gradle-bootstrap.changes b/gradle-bootstrap.changes index 6127769..b03cb33 100644 --- a/gradle-bootstrap.changes +++ b/gradle-bootstrap.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Nov 28 08:46:33 UTC 2019 - Fridrich Strba + +- Regenerate from the non-bootstrap build against objectweb-asm 7.2 + ------------------------------------------------------------------- Sun Nov 24 06:47:31 UTC 2019 - Fridrich Strba