diff --git a/0001-add-javadoc-plugin.patch b/0001-add-javadoc-plugin.patch deleted file mode 100644 index 350b86b..0000000 --- a/0001-add-javadoc-plugin.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 9d40cc895709fe3b178e587b946d47249aac2b5f Mon Sep 17 00:00:00 2001 -From: wang--ge -Date: Thu, 27 Jan 2022 11:19:48 +0800 -Subject: [PATCH] add javadoc plugin - ---- - pom.xml | 13 +++++++++++++ - 1 file changed, 13 insertions(+) - -diff --git a/pom.xml b/pom.xml -index 9ea840a..8003d25 100644 ---- a/pom.xml -+++ b/pom.xml -@@ -360,6 +360,19 @@ - Default - - -+ -+ org.apache.maven.plugins -+ maven-javadoc-plugin -+ 3.0.0-M1 -+ -+ -+ attach-javadoc -+ -+ jar -+ -+ -+ -+ - - - --- -2.27.0 - diff --git a/bcel-6.4.1-src.tar.gz b/bcel-6.4.1-src.tar.gz new file mode 100644 index 0000000..c9d3b53 Binary files /dev/null and b/bcel-6.4.1-src.tar.gz differ diff --git a/bcel-6.5.0-src.tar.gz b/bcel-6.5.0-src.tar.gz deleted file mode 100644 index dcc2f01..0000000 Binary files a/bcel-6.5.0-src.tar.gz and /dev/null differ diff --git a/bcel.spec b/bcel.spec index c36450d..2febf5b 100644 --- a/bcel.spec +++ b/bcel.spec @@ -1,14 +1,12 @@ Name: bcel -Version: 6.5.0 +Version: 6.4.1 Release: 1 Summary: Byte Code Engineering Library License: ASL 2.0 URL: http://commons.apache.org/proper/commons-bcel/ Source0: http://archive.apache.org/dist/commons/bcel/source/bcel-%{version}-src.tar.gz -Patch0: 0001-add-javadoc-plugin.patch BuildArch: noarch -BuildRequires: maven-local maven java-1.8.0-openjdk-devel -Requires: java-1.8.0-openjdk +BuildRequires: maven-local mvn(org.apache.commons:commons-parent:pom:) Obsoletes: bcel-javadoc < %{version}-%{release} Provides: bcel-javadoc = %{version}-%{release} @@ -25,16 +23,10 @@ Java class files (those ending with .class). %mvn_file : %{name} %build -mvn -DskipTests -Drat.skip=true package +%mvn_build -f %install -install -d -m 0755 %{buildroot}%{_javadir} -install -d -m 0755 %{buildroot}%{_mavenpomdir} -install -d -m 0755 %{buildroot}%{_javadocdir}/%{name} -install -pm 0644 target/bcel-%{version}-javadoc.jar %{buildroot}%{_javadocdir}/%{name} -install -pm 0644 target/bcel-%{version}.jar %{buildroot}%{_javadir}/bcel.jar -install -pm 0644 pom.xml %{buildroot}%{_mavenpomdir}/bcel.pom -%add_maven_depmap bcel.pom bcel.jar +%mvn_install %files %attr(0644,root,root) %{_datadir}/maven-metadata/bcel.xml @@ -45,6 +37,10 @@ install -pm 0644 pom.xml %{buildroot}%{_mavenpomdir}/bcel.pom %{_javadocdir}/%{name} %changelog +* Wed Feb 16 2022 yaoxin - 6.4.1-1 +- When bcel is upgraded to 6.5.0,other packages that depend on bcel fail to be compiled. +- Downgrade bcel to 6.4.1. + * Wed Jan 19 2022 SimpleUpdate Robot - 6.5.0-1 - Upgrade to version 6.5.0