This commit is contained in:
parent
04094eb473
commit
0af1bd1651
@ -1,3 +0,0 @@
|
||||
<multibuild>
|
||||
<flavor>bootstrap</flavor>
|
||||
</multibuild>
|
@ -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>
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user