From a294e4e32c99d514d25bf1c18773477f8f2203ee32aa5b1f759f1ff73384cf01 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Fri, 5 May 2023 07:45:01 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/byte-buddy?expand=0&rev=4

---
 byte-buddy.changes |  6 ++++++
 byte-buddy.spec    | 27 +++++++++++++++------------
 2 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/byte-buddy.changes b/byte-buddy.changes
index 6ac9a11..e8b667d 100644
--- a/byte-buddy.changes
+++ b/byte-buddy.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri May  5 07:43:46 UTC 2023 - Fridrich Strba <fstrba@suse.com>
+
+- Do not bootstrap using downloaded binaries, but build the
+  minimal bootstrap package from sources
+
 -------------------------------------------------------------------
 Thu Apr 13 16:47:24 UTC 2023 - Anton Shvetz <shvetz.anton@gmail.com>
 
diff --git a/byte-buddy.spec b/byte-buddy.spec
index 5428612..180ec15 100644
--- a/byte-buddy.spec
+++ b/byte-buddy.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package byte-buddy
+# spec file
 #
 # Copyright (c) 2023 SUSE LLC
 #
@@ -23,11 +23,6 @@
 %else
 %bcond_with bootstrap
 %endif
-%if %{with bootstrap}
-Name:           %{base_name}-bootstrap
-%else
-Name:           %{base_name}
-%endif
 Version:        1.14.4
 Release:        0
 Summary:        Runtime code generation for the Java virtual machine
@@ -36,28 +31,33 @@ Group:          Development/Libraries/Java
 URL:            https://bytebuddy.net/
 Source0:        https://github.com/raphw/%{base_name}/archive/refs/tags/%{base_name}-%{version}.tar.gz
 BuildRequires:  maven-local
-BuildArch:      noarch
-BuildRequires:  maven-local
 BuildRequires:  mvn(codes.rafael.modulemaker:modulemaker-maven-plugin)
 BuildRequires:  mvn(com.google.code.findbugs:jsr305)
 BuildRequires:  mvn(net.java.dev.jna:jna)
 BuildRequires:  mvn(net.java.dev.jna:jna-platform)
 BuildRequires:  mvn(net.sourceforge.findbugs:annotations)
 BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
-BuildRequires:  mvn(org.apache.maven:maven-core)
-BuildRequires:  mvn(org.apache.maven:maven-plugin-api)
+BuildRequires:  mvn(org.apache.maven.plugin-tools:maven-plugin-annotations)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-plugin-plugin)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-shade-plugin) >= 3.3.0
-BuildRequires:  mvn(org.apache.maven.plugin-tools:maven-plugin-annotations)
+BuildRequires:  mvn(org.apache.maven:maven-core)
+BuildRequires:  mvn(org.apache.maven:maven-plugin-api)
 BuildRequires:  mvn(org.eclipse.aether:aether-api)
 BuildRequires:  mvn(org.eclipse.aether:aether-util)
 BuildRequires:  mvn(org.ow2.asm:asm)
 BuildRequires:  mvn(org.ow2.asm:asm-commons)
 BuildRequires:  mvn(org.sonatype.plexus:plexus-build-api)
+BuildArch:      noarch
+%if %{with bootstrap}
+Name:           %{base_name}-bootstrap
+%else
+Name:           %{base_name}
+%endif
 %if %{without bootstrap}
 BuildRequires:  %{base_name}-bootstrap
-Obsoletes:      %{base_name}-bootstrap
+BuildRequires:  fdupes
 Conflicts:      %{base_name}-bootstrap
+Obsoletes:      %{base_name}-bootstrap
 %else
 Conflicts:      %{base_name}
 %endif
@@ -108,6 +108,9 @@ API documentation for %{name}.
 
 %install
 %mvn_install
+%if %{without bootstrap}
+%fdupes -s %{buildroot}%{_javadocdir}
+%endif
 
 %files -f .mfiles
 %license LICENSE NOTICE