From f3529aa787fa5f714efd761a01513a877253b3f3 Mon Sep 17 00:00:00 2001 From: tigro Date: Mon, 23 Dec 2024 19:31:13 +0300 Subject: [PATCH] import libfonts-1.1.3-47.el10 --- .gitignore | 2 +- .libfonts.metadata | 2 +- SOURCES/libfonts-1.1.2.java11.patch | 4 +- SPECS/libfonts.spec | 70 +++++++++++++++++++++++------ 4 files changed, 61 insertions(+), 17 deletions(-) diff --git a/.gitignore b/.gitignore index 5839af5..1d4365e 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/libfonts-1.1.3-jars-itextpatch-deleted.zip +SOURCES/libfonts-1.1.3-jars-itextpatch_deleted-encodings_updated.zip diff --git a/.libfonts.metadata b/.libfonts.metadata index 71fd878..5d2fd80 100644 --- a/.libfonts.metadata +++ b/.libfonts.metadata @@ -1 +1 @@ -241d2e580d9c05dc7e9661a55743a63936de2df6 SOURCES/libfonts-1.1.3-jars-itextpatch-deleted.zip +7db9039af9aa2f94b41946b46fd0ce19690a83b3 SOURCES/libfonts-1.1.3-jars-itextpatch_deleted-encodings_updated.zip diff --git a/SOURCES/libfonts-1.1.2.java11.patch b/SOURCES/libfonts-1.1.2.java11.patch index 5aae626..77d20f3 100644 --- a/SOURCES/libfonts-1.1.2.java11.patch +++ b/SOURCES/libfonts-1.1.2.java11.patch @@ -6,8 +6,8 @@ description="Indicates whether source should be compiled with deprecation information" /> - - -+ -+ ++ ++ = 1.1.3 Requires: java-headless, jpackage-utils, libloader >= 1.1.3 BuildArch: noarch +ExclusiveArch: %{java_arches} noarch Patch0: libfonts-1.1.2.build.patch Patch1: libfonts-1.1.2.java11.patch Patch2: libfonts-1.1.3-remove-antcontrib-support.patch @@ -30,10 +36,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 {} \; rm -r source/org/pentaho/reporting/libraries/fonts/itext mkdir -p lib @@ -61,12 +67,50 @@ cp -rp bin/javadoc/docs/api $RPM_BUILD_ROOT%{_javadocdir}/%{name} %{_javadocdir}/%{name} %changelog -* Mon Aug 09 2021 Mohan Boddu - 1.1.3-35 -- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags - Related: rhbz#1991688 +* Mon Dec 23 2024 Arkady L. Shane - 1.1.3-47 +- Rebuilt for MSVSphere 10 -* Fri Apr 16 2021 Mohan Boddu - 1.1.3-34 -- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 +* Thu Jul 18 2024 Fedora Release Engineering - 1.1.3-47 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Tue Feb 27 2024 Jiri Vanek - 1.1.3-46 +- Rebuilt for java-21-openjdk as system jdk + +* Thu Jan 25 2024 Fedora Release Engineering - 1.1.3-45 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 1.1.3-44 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Thu Jul 20 2023 Fedora Release Engineering - 1.1.3-43 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Tue Jul 11 2023 Gwyn Ciesla - 1.1.3-42 +- Bump EVR + +* Thu Feb 23 2023 Caolán McNamara - 1.1.3-41 +- migrated to SPDX license + +* Thu Jan 19 2023 Fedora Release Engineering - 1.1.3-40 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Jul 21 2022 Fedora Release Engineering - 1.1.3-39 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Fri Jul 08 2022 Jiri Vanek - 1.1.3-38 +- Rebuilt for Drop i686 JDKs + +* Sat Feb 05 2022 Jiri Vanek - 1.1.3-37 +- Rebuilt for java-17-openjdk as system jdk + +* Thu Jan 20 2022 Fedora Release Engineering - 1.1.3-36 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Dec 02 2021 Caolán McNamara - 1.1.3-35 +- prep for f36 mass rebuild for java-17-openjdk + +* Thu Jul 22 2021 Fedora Release Engineering - 1.1.3-34 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild * Fri Mar 12 2021 Caolán McNamara - 1.1.3-33 - Related: rhbz#1895921 replace apache-commons-logging with java.util.logging