From 8ab2376184d870d5690d30b876c082b32ffea36b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mari=C3=A1n=20Kon=C4=8Dek?= <mkoncek@redhat.com>
Date: Wed, 1 Feb 2023 10:07:28 +0100
Subject: [PATCH] Reduce dependencies, reorganize subpackages

Related: rhbz#2140138
---
 jaxb-fi.spec | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/jaxb-fi.spec b/jaxb-fi.spec
index 5764af7..6d7fdca 100644
--- a/jaxb-fi.spec
+++ b/jaxb-fi.spec
@@ -1,6 +1,6 @@
 Name:           jaxb-fi
 Version:        2.1.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Implementation of the Fast Infoset Standard for Binary XML
 # jaxb-fi is licensed ASL 2.0 and EDL-1.0 (BSD)
 # bundled org.apache.xerces.util.XMLChar.java is licensed ASL 1.1
@@ -11,7 +11,6 @@ BuildArch:      noarch
 Source0:        %{url}/archive/%{version}/%{name}-%{version}.tar.gz
 
 BuildRequires:  maven-local
-BuildRequires:  mvn(jakarta.activation:jakarta.activation-api:2.1.0)
 BuildRequires:  mvn(junit:junit)
 BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-assembly-plugin)
@@ -26,14 +25,10 @@ The Fast Infoset specification (ITU-T Rec. X.891 | ISO/IEC 24824-1)
 describes an open, standards-based "binary XML" format that is based on
 the XML Information Set.
 
-%package -n FastInfoset
-Summary:        FastInfoset
-%description -n FastInfoset
-%{summary}.
-
-%package -n FastInfosetRoundTripTests
+%package tests
+License:        ASL 2.0 and BSD
 Summary:        FastInfoset Roundtrip Tests
-%description -n FastInfosetRoundTripTests
+%description tests
 %{summary}.
 
 %prep
@@ -50,22 +45,25 @@ find -name 'module-info.java' -type f -delete
 %pom_remove_plugin :glassfish-copyright-maven-plugin
 %pom_remove_plugin :maven-enforcer-plugin
 
-%mvn_package :fastinfoset-project __noinstall
+%mvn_package :FastInfosetRoundTripTests tests
 
 %build
 # Javadoc fails: error: too many module declarations found
-%mvn_build -s -j
+%mvn_build -j
 
 %install
 %mvn_install
 
-%files -n FastInfoset -f .mfiles-FastInfoset
+%files -f .mfiles
 %license LICENSE NOTICE.md
 %doc README.md
 
-%files -n FastInfosetRoundTripTests -f .mfiles-FastInfosetRoundTripTests
+%files tests -f .mfiles-tests
 %license LICENSE NOTICE.md
 
 %changelog
+* Wed Feb 01 2023 Marián Konček <mkoncek@redhat.com> - 2.1.0-2
+- Reduce dependencies, reorganize subpackages
+
 * Tue Jan 17 2023 Marian Koncek <mkoncek@redhat.com> - 2.1.0-1
 - Initial build