From b5d89456014e0bd8cf94d334bc725384f01564b2 Mon Sep 17 00:00:00 2001 From: tigro Date: Mon, 23 Dec 2024 19:33:16 +0300 Subject: [PATCH] import librepository-1.1.3-44.el10 --- .librepository.metadata | 2 +- SOURCES/librepository-1.1.2.java11.patch | 4 +- SPECS/librepository.spec | 65 +++++++++++++++++++----- 3 files changed, 56 insertions(+), 15 deletions(-) diff --git a/.librepository.metadata b/.librepository.metadata index 3392d2d..08c34ae 100644 --- a/.librepository.metadata +++ b/.librepository.metadata @@ -1 +1 @@ -969cd1ca8b412797d1a496dac3d4c80f48385945 SOURCES/librepository-1.1.3-jarsdeleted.zip +969cd1ca8b412797d1a496dac3d4c80f48385945 SOURCES/librepository-1.1.3-jarsdeleted.zip diff --git a/SOURCES/librepository-1.1.2.java11.patch b/SOURCES/librepository-1.1.2.java11.patch index 7fa7ef7..f68f2a9 100644 --- a/SOURCES/librepository-1.1.2.java11.patch +++ b/SOURCES/librepository-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, libbase >= 1.1.3 BuildArch: noarch +ExclusiveArch: %{java_arches} noarch Patch0: librepository-1.1.2.build.patch Patch1: librepository-1.1.2.java11.patch Patch2: librepository-1.1.3-remove-ant-contrib-support.patch @@ -30,10 +31,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 {} \; mkdir -p lib @@ -61,13 +62,53 @@ cp -rp bin/javadoc/docs/api $RPM_BUILD_ROOT%{_javadocdir}/%{name} %{_javadocdir}/%{name} %changelog -* Mon Aug 09 2021 Mohan Boddu - 1.1.3-31 -- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags - Related: rhbz#1991688 +* Mon Dec 23 2024 Arkady L. Shane - 1.1.3-44 +- Rebuilt for MSVSphere 10 -* Fri Apr 16 2021 Mohan Boddu - 1.1.3-30 -- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 -- Related: rhbz#1951282 replace apache-commons-logging with java.util.logging +* Thu Jul 18 2024 Fedora Release Engineering - 1.1.3-44 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Tue Feb 27 2024 Jiri Vanek - 1.1.3-43 +- Rebuilt for java-21-openjdk as system jdk + +* Thu Jan 25 2024 Fedora Release Engineering - 1.1.3-42 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 1.1.3-41 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Thu Jul 20 2023 Fedora Release Engineering - 1.1.3-40 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Tue Jul 11 2023 Gwyn Ciesla - 1.1.3-39 +- Bump EVR + +* Thu Feb 23 2023 Caolán McNamara - 1.1.3-38 +- migrated to SPDX license + +* Thu Jan 19 2023 Fedora Release Engineering - 1.1.3-37 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Jul 21 2022 Fedora Release Engineering - 1.1.3-36 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Fri Jul 08 2022 Jiri Vanek - 1.1.3-35 +- Rebuilt for Drop i686 JDKs + +* Sat Feb 05 2022 Jiri Vanek - 1.1.3-34 +- Rebuilt for java-17-openjdk as system jdk + +* Thu Jan 20 2022 Fedora Release Engineering - 1.1.3-33 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Dec 02 2021 Caolán McNamara - 1.1.3-32 +- prep for f36 mass rebuild for java-17-openjdk + +* Thu Jul 22 2021 Fedora Release Engineering - 1.1.3-31 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Wed Apr 07 2021 Caolán McNamara - 1.1.3-30 +- Related: rhbz#1895921 replace apache-commons-logging with java.util.logging * Tue Jan 26 2021 Fedora Release Engineering - 1.1.3-29 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild