From 8c2a747940bfc3f24bec418abda97dd5219abc9c Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Mon, 22 Aug 2022 15:03:37 +0200
Subject: [PATCH] Rename javadocs subpackage to javadoc

---
 maven-plugin-tools.spec | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/maven-plugin-tools.spec b/maven-plugin-tools.spec
index 3662ed2..6051382 100644
--- a/maven-plugin-tools.spec
+++ b/maven-plugin-tools.spec
@@ -2,7 +2,7 @@
 
 Name:           maven-plugin-tools
 Version:        3.6.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Maven Plugin Tools
 License:        ASL 2.0
 URL:            http://maven.apache.org/plugin-tools/
@@ -88,14 +88,13 @@ Provides:       maven-shared-plugin-tools-java = 0:%{version}-%{release}
 %description java
 Descriptor extractor for plugins written in Java.
 
-# This "javadocs" package violates packaging guidelines as of Sep 6 2012. The
-# subpackage name "javadocs" instead of "javadoc" is intentional. There was a
-# consensus that current naming scheme should be kept, even if it doesn't
-# conform to the guidelines.  mizdebsk, September 2012
-%package javadocs
+%package javadoc
 Summary:        Javadoc for %{name}
+# Obsoletes can be removed in Fedora 40 -- maven-plugin-tools-javadocs
+# was renamed to maven-plugin-tools-javadoc in Fedora 38.
+Obsoletes:      %{name}-javadocs < 3.6.4-3
 
-%description javadocs
+%description javadoc
 API documentation for %{name}.
 
 
@@ -155,11 +154,14 @@ rm maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/PluginReport
 
 %files java -f .mfiles-maven-plugin-tools-java
 
-%files javadocs -f .mfiles-javadoc
+%files javadoc -f .mfiles-javadoc
 %license LICENSE NOTICE
 
 
 %changelog
+* Mon Aug 22 2022 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.6.4-3
+- Rename javadocs subpackage to javadoc
+
 * Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild