From cb1b19b20a22ea17d449d7bde980eed394b3bb65 Mon Sep 17 00:00:00 2001
From: Silvan Calarco <silvan.calarco@mambasoft.it>
Date: Sat, 6 Jan 2024 00:16:35 +0100
Subject: [PATCH] added -filesystem subpackage [release 5.3.1-3mamba;Mon Apr 12
 2021]

---
 README.md         |  1 +
 javapackages.spec | 23 ++++++++++++++++++++---
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index a716270..85b21c3 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,4 @@
 # javapackages
 
 Java Packages Tools is a collection of tools that make it easier to build RPM packages containing software running on the Java platform.
+
diff --git a/javapackages.spec b/javapackages.spec
index b27081b..ab72a8b 100644
--- a/javapackages.spec
+++ b/javapackages.spec
@@ -1,6 +1,6 @@
 Name:          javapackages
 Version:       5.3.1
-Release:       2mamba
+Release:       3mamba
 Summary:       A collection of tools that make it easier to build RPM packages containing software running on the Java platform
 Group:         Development/Tools
 Vendor:        openmamba
@@ -15,14 +15,26 @@ BuildRequires: libpython3-devel
 BuildRequires: asciidoc
 Requires:      rpm
 Provides:      jpackage-utils
-Obsoletes:     jpackage-utils
+Obsoletes:     jpackage-utils < 5.3.1
 Provides:      javapackages-tools = %{?epoch:%epoch:}%{version}-%{release}
+Requires:      %{name}-filesystem = %{?epoch:%epoch:}%{version}-%{release}
 
 %description
 Java Packages Tools is a collection of tools that make it easier to build RPM packages containing software running on the Java platform.
 
+%package filesystem
+Group:         System/Configuration
+Summary:       Java filesystem layout
+
+%description filesystem
+Java filesystem layout.
+
 #% debug_package
 
+# Don't generate requires on jpackage-utils and java-headless for
+# provided pseudo-artifacts: com.sun:tools and sun.jdk:jconsole.
+%global __requires_exclude_from %{?__requires_exclude_from:%__requires_exclude_from|}/maven-metadata/javapackages-metadata.xml$
+
 %prep
 %setup -q
 
@@ -76,7 +88,6 @@ chmod +x %{buildroot}%{_prefix}/lib/rpm/*.{req,prov}
 %{_prefix}/lib/rpm/fileattrs/osgi.attr
 %{_prefix}/lib/rpm/javadoc.req
 %{_prefix}/lib/rpm/macros.d/macros.fjava
-%{_prefix}/lib/rpm/macros.d/macros.javapackages-filesystem
 %{_prefix}/lib/rpm/macros.d/macros.jpackage
 %{_prefix}/lib/rpm/maven.prov
 %{_prefix}/lib/rpm/maven.req
@@ -99,7 +110,13 @@ chmod +x %{buildroot}%{_prefix}/lib/rpm/*.{req,prov}
 %{_datadir}/xmvn/configuration.xml
 %doc LICENSE
 
+%files filesystem -f files-filesystem
+%defattr(-,root,root)
+
 %changelog
+* Mon Apr 12 2021 Silvan Calarco <silvan.calarco@mambasoft.it> 5.3.1-3mamba
+- added -filesystem subpackage
+
 * Sat Mar 27 2021 Silvan Calarco <silvan.calarco@mambasoft.it> 5.3.1-2mamba
 - make %{_prefix}/lib/rpm/*,{req,prov} executable