Accepting request 942905 from Java:packages

OBS-URL: https://build.opensuse.org/request/show/942905
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/jakarta-commons-modeler?expand=0&rev=20

commons-modeler-2.0-src.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:56357eaf38757babebd11f38a4697fc459ab0a651ae0945a4a358473803a310b
-size 96119

commons-modeler-2.0.1-src.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e10a7ac6b6827cba25f40fed43380051023097244fe34b012227aabd5d01e8f0
+size 116785

commons-modeler-2.0.1-src.tar.gz.asc

@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: PGP 8.1 - not licensed for commercial use: www.pgp.com
+
+iQA/AwUARnsIhBhhwyLFYBSyEQJhrACgk1fRD8EqIR33d9kW8hvwoHo7+X0AoPr8
+7O4pka3UZOrmbnvgadAEBc4S
+=OYD8
+-----END PGP SIGNATURE-----

jakarta-commons-modeler.changes

@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Tue Dec 28 08:23:03 UTC 2021 - David Anes <david.anes@suse.com>
+
+- Update to 2.0.1:
+  * Modeler 2.0.1 is binary and source compatible with Modeler 2.0
+  * Bugs fixed:
+    - ant jar in trunk fails
+    - MbeansDescriptorsDigesterSource.java is never build if just 
+    setting commons-digester.jar property in build.properties
+    - ant.properties is missing from the Modeler jar
+    - mbeans-descriptors.dtd is missing from the Modeler jar and
+    binary distro
+- Clean spec file and rpm-lint warnings:
+  * License is marked as a license file
+  * Docs endlines are converted to UNIX.
+
 -------------------------------------------------------------------
 Mon Sep 18 11:43:04 UTC 2017 - fstrba@suse.com
 

jakarta-commons-modeler.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package jakarta-commons-modeler
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,20 +12,21 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
 %define base_name	modeler
 %define short_name	commons-%{base_name}
 Name:           jakarta-commons-modeler
-Version:        2.0
+Version:        2.0.1
 Release:        0
 Summary:        Jakarta Commons Modeler Package
 License:        Apache-2.0
 Group:          Development/Libraries/Java
-Url:            http://jakarta.apache.org/commons/modeler/
+URL:            https://commons.apache.org/dormant/commons-modeler/
-Source0:        %{short_name}-%{version}-src.tar.bz2
+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
 BuildRequires:  ant
 BuildRequires:  fdupes
 BuildRequires:  jakarta-commons-digester
@@ -93,8 +94,15 @@ mkdir -p %{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
-%doc LICENSE.txt NOTICE.txt RELEASE-NOTES.txt xdocs
+%doc NOTICE.txt RELEASE-NOTES.txt xdocs
+%license LICENSE.txt
 %{_javadir}/*
 
 %files javadoc