From 9b97e37f949b06cca4fdcfab313d7c16ca55f8d0 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 3 Mar 2025 11:57:13 +0100 Subject: [PATCH] Remove javadoc subpackage --- apache-commons-collections.spec | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/apache-commons-collections.spec b/apache-commons-collections.spec index 015c56d..53a7c39 100644 --- a/apache-commons-collections.spec +++ b/apache-commons-collections.spec @@ -23,6 +23,8 @@ BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.commons:commons-parent:pom:) BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin) %endif +# TODO Remove in Fedora 46 +Obsoletes: %{name}-javadoc < 3.2.2-57 %description The introduction of the Collections API by Sun in JDK 1.2 has been a @@ -46,12 +48,6 @@ Requires: %{name} = %{version}-%{release} %description testframework %{summary}. -%package javadoc -Summary: API documentation for %{name} - -%description javadoc -API documentation for %{name}. - %prep %autosetup -p1 -C @@ -70,7 +66,7 @@ sed -i 's/\r//' LICENSE.txt PROPOSAL.html README.txt NOTICE.txt %mvn_file ':commons-collections{,-testframework}' %{name}@1 commons-collections@1 %build -%mvn_build -- -Dcommons.packageId=collections +%mvn_build -j -- -Dcommons.packageId=collections %install %mvn_artifact commons-collections:commons-collections-testframework:%{version} target/commons-collections-testframework-%{version}.jar @@ -82,8 +78,5 @@ sed -i 's/\r//' LICENSE.txt PROPOSAL.html README.txt NOTICE.txt %files testframework -f .mfiles-testframework -%files javadoc -f .mfiles-javadoc -%license LICENSE.txt NOTICE.txt - %changelog %autochangelog