From 0af1bd16519f0948d2ae5b0e12a09a1c6367af9bdc6746fcd2a4dd25c471cdad Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Thu, 31 Aug 2023 06:41:04 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/apache-commons-lang3?expand=0&rev=32

---
 _multibuild                  |  3 ---
 apache-commons-lang3.changes |  8 +------
 apache-commons-lang3.spec    | 41 ++++++------------------------------
 3 files changed, 8 insertions(+), 44 deletions(-)
 delete mode 100644 _multibuild

diff --git a/_multibuild b/_multibuild
deleted file mode 100644
index 655ec81..0000000
--- a/_multibuild
+++ /dev/null
@@ -1,3 +0,0 @@
-<multibuild>
-	<flavor>bootstrap</flavor>
-</multibuild>
diff --git a/apache-commons-lang3.changes b/apache-commons-lang3.changes
index 9c02ad8..9a9b4bd 100644
--- a/apache-commons-lang3.changes
+++ b/apache-commons-lang3.changes
@@ -1,13 +1,7 @@
 -------------------------------------------------------------------
 Wed Aug 30 20:57:36 UTC 2023 - Fridrich Strba <fstrba@suse.com>
 
-- Split into bootstrap and full package using the _multibuild
-  * this should allow to build the new bcel without cycles
-- Removed patch:
-  * apache-commons-lang3-junit-bom.patch
-    + not needed since we install the pom file using the new
-      %%mvn_install_pom macro which sanitizes the pom file to the
-      bare runtime dependencies.
+- Break cycle with the new bcel
 
 -------------------------------------------------------------------
 Wed Dec 29 15:18:48 UTC 2021 - Pedro Monreal <pmonreal@suse.com>
diff --git a/apache-commons-lang3.spec b/apache-commons-lang3.spec
index 59ec1ab..d573d70 100644
--- a/apache-commons-lang3.spec
+++ b/apache-commons-lang3.spec
@@ -18,13 +18,7 @@
 
 %define base_name lang3
 %define short_name commons-%{base_name}
-%define full_name apache-%{short_name}
-%global flavor @BUILD_FLAVOR@%{nil}
-%if "%{flavor}" == "bootstrap"
-%bcond_without bootstrap
-%else
-%bcond_with bootstrap
-%endif
+Name:           apache-%{short_name}
 Version:        3.12.0
 Release:        0
 Summary:        Apache Commons Lang Package
@@ -34,21 +28,15 @@ URL:            https://commons.apache.org/proper/commons-lang/
 Source0:        https://dlcdn.apache.org/commons/lang/source/%{short_name}-%{version}-src.tar.gz
 Source1:        build.xml
 Source2:        default.properties
-BuildRequires:  java-devel >= 1.8
-BuildArch:      noarch
-%if %{with bootstrap}
-Name:           %{full_name}-bootstrap
-Conflicts:      %{full_name}
-%else
-Name:           %{full_name}
 BuildRequires:  ant
 BuildRequires:  fdupes
+BuildRequires:  java-devel >= 1.8
 BuildRequires:  javapackages-local >= 6
-Conflicts:      %{full_name}-bootstrap
+#!BuildIgnore:  bcel
+#!BuildIgnore:  xalan-j2
+#!BuildIgnore:  xerces-j2
 Provides:       %{short_name} = %{version}-%{release}
-Obsoletes:      %{full_name}-bootstrap
-%endif
-#!BuildIgnore:  bcel xalan-j2 xerces-j2
+BuildArch:      noarch
 
 %description
 The standard Java libraries fail to provide enough methods for
@@ -78,18 +66,12 @@ cp %{SOURCE2} .
 sed -i 's/\r//' *.txt
 
 %build
-%if %{without bootstrap}
 export OPT_JAR_LIST=`cat %{_sysconfdir}/ant.d/junit`
 export CLASSPATH=
 ant \
     -Dcompile.source=1.8 -Dcompile.target=1.8 \
     -Dfinal.name=%{short_name} \
      jar javadoc
-%else
-mkdir -p target/classes
-javac -source 8 -target 8 -encoding utf-8 -d target/classes $(find src/main/java -name \*.java | xargs)
-jar -cf target/%{short_name}.jar -C target/classes .
-%endif
 
 %install
 
@@ -98,10 +80,9 @@ install -dm 755 %{buildroot}%{_javadir}
 install -m 0644  target/%{short_name}.jar %{buildroot}%{_javadir}/%{full_name}.jar
 ln -sf %{full_name}.jar %{buildroot}%{_javadir}/%{short_name}.jar
 
-%if %{without bootstrap}
 # pom
 install -dm 755 %{buildroot}%{_mavenpomdir}
-%mvn_install_pom  pom.xml %{buildroot}%{_mavenpomdir}/%{full_name}.pom
+%{mvn_install_pom}  pom.xml %{buildroot}%{_mavenpomdir}/%{full_name}.pom
 %add_maven_depmap %{full_name}.pom %{full_name}.jar
 
 # javadoc
@@ -117,12 +98,4 @@ cp -pr target/apidocs/* %{buildroot}%{_javadocdir}/%{full_name}/
 %files javadoc
 %{_javadocdir}/%{full_name}
 
-%else
-
-%files
-%license LICENSE.txt NOTICE.txt
-%{_javadir}/*.jar
-
-%endif
-
 %changelog