diff --git a/jakarta-commons-lang.spec b/jakarta-commons-lang.spec index 358bc09..1e0a023 100644 --- a/jakarta-commons-lang.spec +++ b/jakarta-commons-lang.spec @@ -1,24 +1,28 @@ %define javahome %{_jvmdir}/jdk Name: jakarta-commons-lang -Version: 2.3 -Release: 4mamba +Version: 3.12.0 +Release: 1mamba Summary: Jakarta Commons Lang Package Group: Development/Libraries/Java Vendor: openmamba Distribution: openmamba Packager: Silvan Calarco -URL: http://commons.apache.org/lang/ -Source0: http://archive.apache.org/dist/commons/lang/source/commons-lang-%{version}-src.tar.gz +URL: https://commons.apache.org/proper/commons-lang/ +Source0: https://www.apache.org/dist/commons/lang/source/commons-lang3-%{version}-src.tar.gz Source1: jakarta-commons-lang-2.3.pom Patch0: jakarta-commons-2.3-lang-notarget.patch Patch1: jakarta-commons-2.3-lang-addosgimanifest.patch License: Apache License Version 2.0 +## AUTOBUILDREQ-BEGIN +## AUTOBUILDREQ-END BuildRequires: apache-ant BuildRequires: apache-ant-junit +BuildRequires: apache-maven BuildRequires: java-junit3 -BuildRequires: jpackage-utils -Requires: jpackage-utils -BuildRoot: %{_tmppath}/%{name}-%{version}-root +BuildRequires: javapackages +Requires: javapackages +Provides: jakarta-commons-lang24 +Obsoletes: jakarta-commons-lang24 <= 2.4-3mamba %description The standard Java libraries fail to provide enough methods for manipulation of its core classes. The Lang Component provides these extra methods. @@ -39,24 +43,11 @@ Date and a series of utilities dedicated to help with building methods, such as This package contains javadoc for %{name}. %prep -%setup -q -n commons-lang-%{version}-src -perl -pi -e 's/\r//g' *.txt -sed -i 's/\r//' STATUS.html -%patch0 -%patch1 +%setup -q -n commons-lang3-%{version}-src %build export JAVA_HOME=%javahome -export CLASSPATH=$(build-classpath junit-3.8.2 ant/ant-junit):target/classes:target/tests -ant \ - -Djunit.jar=$(find-jar junit-3.8.2) \ - -Djdk.javadoc=%{_javadocdir}/java \ - -Dfinal.name=commons-lang \ - -Dtest.failonerror=false \ - jar javadoc \ -%if "%{stage1}" != "1" - test -%endif +mvn -Dproject.build.outputTimestamp="$SOURCE_DATE_EPOCH" -Dmaven.javadoc.skip=true -Dmaven.test.skip=true clean package %install [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" @@ -64,10 +55,7 @@ ant \ mkdir -p %{buildroot}%{_javadir} mkdir -p %{buildroot}%{_datadir}/maven2/poms -install -p -m 644 dist/commons-lang.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar - -install -pm 644 %{SOURCE1} %{buildroot}%{_datadir}/maven2/poms/JPP-jakarta-commons-lang.pom -%add_to_maven_depmap commons-lang commons-lang %{version} JPP commons-lang +install -p -m 644 target/commons-lang3-%{version}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar ( cd %{buildroot}%{_javadir} @@ -82,37 +70,21 @@ install -pm 644 %{SOURCE1} %{buildroot}%{_datadir}/maven2/poms/JPP-jakarta-commo done ) -mkdir -p %{buildroot}%{_javadocdir}/jakarta-commons-lang-%{version} -cp -pr dist/docs/api/* %{buildroot}%{_javadocdir}/jakarta-commons-lang-%{version} -ln -s jakarta-commons-lang-%{version} %{buildroot}%{_javadocdir}/jakarta-commons-lang - -##%{_bindir}/aot-compile-rpm - %clean [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" -%post -%update_maven_depmap - -%postun -%update_maven_depmap - %files %defattr(-,root,root) %{_javadir}/jakarta-commons-lang-%{version}.jar %{_javadir}/jakarta-commons-lang.jar %{_javadir}/commons-lang-%{version}.jar %{_javadir}/commons-lang.jar -%{_datadir}/maven2/poms -%{_mavendepmapfragdir} -%doc STATUS.html LICENSE.txt NOTICE.txt RELEASE-NOTES.txt - -%files javadoc -%defattr(-,root,root) -%{_javadocdir}/jakarta-commons-lang-%{version} -%{_javadocdir}/jakarta-commons-lang +%doc LICENSE.txt NOTICE.txt %changelog +* Wed Aug 10 2022 Silvan Calarco 3.12.0-1mamba +- update to 3.12.0 + * Thu Mar 24 2011 gil 2.3-4mamba - rebuilt with java-openjdk support