From c387e1d1eebbf6e37b9a17c7f894ffda40311f90 Mon Sep 17 00:00:00 2001
From: Didik Supriadi <didiksupriadi41@fedoraproject.org>
Date: Oct 29 2021 10:16:23 +0000
Subject: Enable roundtriptest and samples module


---

diff --git a/jaxb-fi.spec b/jaxb-fi.spec
index 24e154c..94de8fa 100644
--- a/jaxb-fi.spec
+++ b/jaxb-fi.spec
@@ -1,16 +1,15 @@
 Name:           jaxb-fi
 Version:        1.2.18
-Release:        4%{?dist}
+Release:        5%{?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
 License:        ASL 2.0 and BSD and ASL 1.1
-
 URL:            https://github.com/eclipse-ee4j/jaxb-fi
-Source0:        %{url}/archive/%{version}/%{name}-%{version}.tar.gz
-
 BuildArch:      noarch
 
+Source0:        %{url}/archive/%{version}/%{name}-%{version}.tar.gz
+
 BuildRequires:  maven-local
 BuildRequires:  mvn(com.sun.xml.stream.buffer:streambuffer)
 BuildRequires:  mvn(jakarta.activation:jakarta.activation-api)
@@ -34,44 +33,71 @@ 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
+Summary:        FastInfoset Roundtrip Tests
+%description -n FastInfosetRoundTripTests
+%{summary}.
+
+%package -n FastInfosetSamples
+Summary:        FastInfoset Samples
+%description -n FastInfosetSamples
+%{summary}.
+
+%package -n FastInfosetUtilities
+Summary:        FastInfoset Utilities
+%description -n FastInfosetUtilities
+%{summary}.
 
 %prep
-%setup -q
+%autosetup
 
 pushd code
 # remove unnecessary dependency on parent POM
 # org.eclipse.ee4j:project is not packaged and not required
 %pom_remove_parent
 
-# disable unnecessary submodules
-%pom_disable_module roundtrip-tests
-%pom_disable_module samples
-
 # disable unnecessary plugins
 %pom_remove_plugin :buildnumber-maven-plugin
 %pom_remove_plugin :glassfish-copyright-maven-plugin
-popd
 
+# disable parent
+%mvn_package :fastinfoset-project __noinstall
+popd
 
 %build
 pushd code
-# skip javadoc build due to https://github.com/fedora-java/xmvn/issues/58
-%mvn_build -f -j -- -DbuildNumber=unknown
+%mvn_build -s -f -j -- -DbuildNumber=unknown -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8
 popd
 
-
 %install
 pushd code
 %mvn_install
 popd
 
-
-%files -f code/.mfiles
+%files -n FastInfoset -f code/.mfiles-FastInfoset
 %license LICENSE NOTICE.md
 %doc README.md
 
+%files -n FastInfosetRoundTripTests -f code/.mfiles-FastInfosetRoundTripTests
+%license LICENSE NOTICE.md
+
+%files -n FastInfosetSamples -f code/.mfiles-FastInfosetSamples
+%license LICENSE NOTICE.md
+
+%files -n FastInfosetUtilities -f code/.mfiles-FastInfosetUtilities
+%license LICENSE NOTICE.md
 
 %changelog
+* Fri Oct 29 2021 Didik Supriadi <didiksupriadi41@fedoraproject.org> - 1.2.18-5
+- Enable roundtrip-tests and samples module
+- Enable singleton package
+- Enable javadoc package
+
 * Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.18-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild