From d327c4137a273fa63534baa877cd37f239cc007b Mon Sep 17 00:00:00 2001
From: tigro <tigro@msvsphere-os.ru>
Date: Mon, 23 Dec 2024 19:30:37 +0300
Subject: [PATCH] import libbase-1.1.3-43.el10

---
 .libbase.metadata                  |  2 +-
 SOURCES/libbase-1.1.2.java11.patch |  4 +-
 SPECS/libbase.spec                 | 61 ++++++++++++++++++++++++------
 3 files changed, 53 insertions(+), 14 deletions(-)

diff --git a/.libbase.metadata b/.libbase.metadata
index c6976aa..647cfdf 100644
--- a/.libbase.metadata
+++ b/.libbase.metadata
@@ -1 +1 @@
-d0a69dc19f2eb6d10fb8bb660d36f453103ac571 SOURCES/libbase-1.1.3-jarsdeleted.zip
+d0a69dc19f2eb6d10fb8bb660d36f453103ac571  SOURCES/libbase-1.1.3-jarsdeleted.zip
diff --git a/SOURCES/libbase-1.1.2.java11.patch b/SOURCES/libbase-1.1.2.java11.patch
index 146bd7d..751ab34 100644
--- a/SOURCES/libbase-1.1.2.java11.patch
+++ b/SOURCES/libbase-1.1.2.java11.patch
@@ -6,8 +6,8 @@
              description="Indicates whether source should be compiled with deprecation information" />
 -  <property name="javac.source" value="1.5" description="Provide source compatibility with specified release" />
 -  <property name="javac.target" value="1.5" description="Generate class files for specific VM version" />
-+  <property name="javac.source" value="1.6" description="Provide source compatibility with specified release" />
-+  <property name="javac.target" value="1.6" description="Generate class files for specific VM version" />
++  <property name="javac.source" value="1.8" description="Provide source compatibility with specified release" />
++  <property name="javac.target" value="1.8" description="Generate class files for specific VM version" />
  
    <!-- Build Cache properties -->
    <property name="build.cache.dir"
diff --git a/SPECS/libbase.spec b/SPECS/libbase.spec
index 58aba51..abc66d4 100644
--- a/SPECS/libbase.spec
+++ b/SPECS/libbase.spec
@@ -1,8 +1,8 @@
 Name: libbase
 Version: 1.1.3
-Release: 31%{?dist}
+Release: 43%{?dist}
 Summary: JFree Base Services
-License: LGPLv2
+License: LGPL-2.1-only
 #Original source: http://downloads.sourceforge.net/jfreereport/%%{name}-%%{version}.zip
 #unzip, find . -name "*.jar" -exec rm {} \;
 #to simplify the licensing
@@ -11,6 +11,7 @@ URL: http://reporting.pentaho.org/
 BuildRequires: ant, java-devel, jpackage-utils
 Requires: java-headless, jpackage-utils
 BuildArch: noarch
+ExclusiveArch:  %{java_arches} noarch
 
 Patch0: libbase-1.1.2.build.patch
 Patch1: libbase-1.1.2.java11.patch
@@ -32,10 +33,10 @@ Javadoc for %{name}.
 
 %prep
 %setup -q -c
-%patch0 -p1 -b .build
-%patch1 -p1 -b .java11
-%patch2 -p1 -b .no_antcontrib
-%patch3 -p1 -b .no_commons_logging
+%patch -P0 -p1 -b .build
+%patch -P1 -p1 -b .java11
+%patch -P2 -p1 -b .no_antcontrib
+%patch -P3 -p1 -b .no_commons_logging
 
 find . -name "*.jar" -exec rm -f {} \;
 
@@ -57,12 +58,50 @@ cp -rp bin/javadoc/docs/api $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 %{_javadocdir}/%{name}
 
 %changelog
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.1.3-31
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
+* Mon Dec 23 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 1.1.3-43
+- Rebuilt for MSVSphere 10
 
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.1.3-30
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.3-43
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Tue Feb 27 2024 Jiri Vanek <jvanek@redhat.com> - 1.1.3-42
+- Rebuilt for java-21-openjdk as system jdk
+
+* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.3-41
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.3-40
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.3-39
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Tue Jul 11 2023 Gwyn Ciesla <gwync@protonmail.com> - 1.1.3-38
+- Bump EVR
+
+* Thu Feb 23 2023 Caolán McNamara <caolanm@redhat.com> - 1.1.3-37
+- migrated to SPDX license
+
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.3-36
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.3-35
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Fri Jul 08 2022 Jiri Vanek <jvanek@redhat.com> - 1.1.3-34
+- Rebuilt for Drop i686 JDKs
+
+* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 1.1.3-33
+- Rebuilt for java-17-openjdk as system jdk
+
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.3-32
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Thu Dec 02 2021 Caolán McNamara <caolanm@redhat.com> - 1.1.3-31
+- prep for f36 mass rebuild for java-17-openjdk
+
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.3-30
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 
 * Tue Feb 23 2021 Caolán McNamara <caolanm@redhat.com> - 1.1.3-29
 - Related: rhbz#1895921 replace apache-commons-logging with java.util.logging