diff --git a/commons-modeler-2.0.1.pom b/commons-modeler-2.0.1.pom
new file mode 100644
index 0000000..37d47f2
--- /dev/null
+++ b/commons-modeler-2.0.1.pom
@@ -0,0 +1,186 @@
+
+ 4.0.0
+ commons-modeler
+ commons-modeler
+ Commons Modeler
+ 2.0.1
+ Commons Modeler
+ http://jakarta.apache.org/commons/${pom.artifactId.substring(8)}/
+
+ http://issues.apache.org/jira/browse/${pom.artifactId.substring(8).toUpperCase()}
+
+
+
+
+
+ commons-dev@jakarta.apache.org
+
+
+
+
+ 2002
+
+
+ Commons Dev List
+ commons-dev-subscribe@jakarta.apache.org
+ commons-dev-unsubscribe@jakarta.apache.org
+ http://mail-archives.apache.org/mod_mbox/jakarta-commons-dev/
+
+
+ Commons User List
+ commons-user-subscribe@jakarta.apache.org
+ commons-user-unsubscribe@jakarta.apache.org
+ http://mail-archives.apache.org/mod_mbox/jakarta-commons-user/
+
+
+
+
+ craigmcc
+ Craig McClanahan
+ craigmcc@apache.org
+ Apache
+
+
+ yoavs
+ Yoav Shapira
+ yoavs@apache.org
+ Apache
+
+
+ billbarker
+ Bill Barker
+ billbarker@apache.org
+ Apache
+
+
+ dims
+ Davanum Srinivas
+ dims@apache.org
+ Apache
+
+
+
+
+ The Apache Software License, Version 2.0
+ /LICENSE.txt
+
+
+
+ scm:svn:http://svn.apache.org/repos/asf/jakarta/commons/proper/${pom.artifactId.substring(8)}/trunk
+ http://svn.apache.org/repos/asf/jakarta/commons/proper/${pom.artifactId.substring(8)}/trunk
+
+
+ The Apache Software Foundation
+ http://jakarta.apache.org
+
+
+ src/java
+ src/test
+
+
+ META-INF
+ .
+
+ NOTICE.txt
+
+
+
+ META-INF
+ src/java/org/apache/commons/modeler/ant
+
+ ant.properties
+
+
+
+ src/java
+
+ **/ant.properties
+ **/mbeans-descriptors.dtd
+
+
+
+
+
+ ${pom.build.unitTestSourceDirectory}
+
+ **/*.xml
+
+
+
+
+
+ maven-surefire-plugin
+
+
+ **/*TestCase.java
+
+
+
+
+ maven-changelog-plugin
+ 1.9.1
+
+ <strong>Site Only</strong> - v1.9.1 (minimum)
+ required for building the Site documentation.
+
+
+
+ maven-xdoc-plugin
+ 1.9.2
+
+ <strong>Site Only</strong> - v1.9.2 (minimum)
+ required for building the Site documentation.
+
+
+
+
+
+
+ commons-digester
+ commons-digester
+ 1.4.1
+
+
+ commons-logging
+ commons-logging-api
+ 1.0.4
+
+
+ mx4j
+ mx4j-jmx
+ 2.1.1
+ provided
+
+
+ xml-apis
+ xml-apis
+ 2.0.2
+ provided
+
+
+ junit
+ junit
+ 3.7
+ test
+
+
+ ant
+ ant
+ 1.5
+ true
+
+
+
+
+ default
+ Default Repository
+ file:///www/jakarta.apache.org/builds/jakarta-commons/${pom.artifactId.substring(8)}/
+
+
+ default
+ Default Site
+ scp://people.apache.org//www/jakarta.apache.org/commons/${pom.artifactId.substring(8)}/
+
+ converted
+
+
\ No newline at end of file
diff --git a/jakarta-commons-modeler.changes b/jakarta-commons-modeler.changes
index 97eb947..11f6fa7 100644
--- a/jakarta-commons-modeler.changes
+++ b/jakarta-commons-modeler.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Aug 21 16:28:06 UTC 2023 - Fridrich Strba
+
+- Clean the spec file a bit and distribute with proper maven
+ metadata
+
-------------------------------------------------------------------
Mon Mar 21 04:56:45 UTC 2022 - Fridrich Strba
diff --git a/jakarta-commons-modeler.spec b/jakarta-commons-modeler.spec
index 91ee914..c8b2d84 100644
--- a/jakarta-commons-modeler.spec
+++ b/jakarta-commons-modeler.spec
@@ -1,7 +1,7 @@
#
# spec file for package jakarta-commons-modeler
#
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -27,25 +27,21 @@ Group: Development/Libraries/Java
URL: https://commons.apache.org/dormant/commons-modeler/
Source0: https://archive.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz
Source1: https://archive.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz.asc
+Source10: https://repo1.maven.org/maven2/%{short_name}/%{short_name}/%{version}/%{short_name}-%{version}.pom
BuildRequires: ant
BuildRequires: fdupes
BuildRequires: jakarta-commons-digester
+BuildRequires: jakarta-commons-logging
BuildRequires: java-devel >= 1.8
-BuildRequires: javapackages-tools
+BuildRequires: javapackages-local >= 6
BuildRequires: junit
BuildRequires: mx4j
BuildRequires: xalan-j2
+BuildRequires: xerces-j2
BuildRequires: xml-commons-apis
-Requires: jakarta-commons-beanutils >= 1.3
-Requires: jakarta-commons-collections >= 2.0
-Requires: jakarta-commons-digester >= 1.2
-Requires: jakarta-commons-logging >= 1.0
-Requires: jaxp_parser_impl
-Requires: jaxp_transform_impl
-Requires: mx4j
-Requires: xml-commons-apis
Provides: %{short_name} = %{version}-%{release}
Obsoletes: %{short_name} < %{version}-%{release}
+Provides: apache-%{short_name} = %{version}-%{release}
BuildArch: noarch
%description
@@ -69,14 +65,18 @@ Modeler Package.
%prep
%setup -q -n %{short_name}-%{version}-src
-# remove all binary libs
-find . -name "*.jar" -exec rm -f {} \;
+
+# convert DOS lineenedings to unix
+sed -i 's/\r$//' NOTICE.txt
+sed -i 's/\r$//' RELEASE-NOTES.txt
+sed -i 's/\r$//' xdocs/*.xml
+sed -i 's/\r$//' xdocs/style/*.css
%build
-ant \
+%{ant} \
-Dant.jar=$(build-classpath ant) \
- -Djaxp.parser.jar=$(build-classpath jaxp_parser_impl) \
- -Djaxp.xalan.jar=$(build-classpath jaxp_trasform_impl) \
+ -Djaxp.parser.jar=$(build-classpath xerces-j2) \
+ -Djaxp.xalan.jar=$(build-classpath xalan-j2) \
-Djmx.jar=$(build-classpath mx4j/mx4j-jmx) \
-Djunit.jar=$(build-classpath junit) \
-Dcommons-digester.jar=$(build-classpath commons-digester) \
@@ -85,26 +85,26 @@ ant \
dist
%install
-# jars
-mkdir -p %{buildroot}%{_javadir}
-cp -a dist/%{short_name}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
-(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -s ${jar} `echo $jar| sed "s|jakarta-||g"`; done)
-(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -s ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
+
+# jar
+install -dm 0755 %{buildroot}%{_javadir}
+install -pm 0644 dist/%{short_name}.jar %{buildroot}%{_javadir}/%{name}.jar
+ln -sf %{name}.jar %{buildroot}%{_javadir}/%{short_name}.jar
+
+# pom
+install -dm 0755 %{buildroot}%{_mavenpomdir}
+%{mvn_install_pom} %{SOURCE10} %{buildroot}%{_mavenpomdir}/%{name}.pom
+%add_maven_depmap %{name}.pom %{name}.jar
+
# javadoc
-mkdir -p %{buildroot}%{_javadocdir}/%{name}
+install -dm 0755 %{buildroot}%{_javadocdir}/%{name}
cp -a dist/docs/* %{buildroot}%{_javadocdir}/%{name}
%fdupes -s %{buildroot}%{_javadocdir}/%{name}
-# convert DOS lineenedings to unix
-sed -i 's/\r$//' NOTICE.txt
-sed -i 's/\r$//' RELEASE-NOTES.txt
-sed -i 's/\r$//' xdocs/*.xml
-sed -i 's/\r$//' xdocs/style/*.css
-
-%files
+%files -f .mfiles
%doc NOTICE.txt RELEASE-NOTES.txt xdocs
%license LICENSE.txt
-%{_javadir}/*
+%{_javadir}/%{short_name}.jar
%files javadoc
%{_javadocdir}/%{name}