From 10792a3143897b4f692a5434386d2cba3460103b Mon Sep 17 00:00:00 2001 From: sbluhm Date: Wed, 29 Sep 2021 09:12:10 +0200 Subject: [PATCH 01/17] - Re-added module-info.java. - Force Java 11 on RHEL build. --- xmlpull.spec | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/xmlpull.spec b/xmlpull.spec index dd83fe5..ba6d322 100644 --- a/xmlpull.spec +++ b/xmlpull.spec @@ -1,6 +1,6 @@ Name: xmlpull Version: 1.2.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: XML Pull Parsing API License: Public Domain @@ -29,12 +29,12 @@ find \( -name \*.jar -o -name \*.class \) -delete %pom_disable_module xpp3_min -# using java 8, we need to remove the java module -rm xmlpull/src/main/java/module-info.java - %mvn_package :%{name}-xpp3-parent __noinstall %build +%if 0%{?rhel} +export JAVA_HOME=/usr/lib/jvm/java-11 +%endif %mvn_build -- -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8 %install @@ -45,5 +45,9 @@ rm xmlpull/src/main/java/module-info.java %doc %{name}/README.adoc %changelog +* Wed Sep 29 07:07:25 UTC 2021 - Stefan Bluhm - 1.2.0-2 +- Re-added module-info.java. +- Force Java 11 on RHEL build. + * Wed Aug 11 2021 Didik Supriadi - 1.2.0-1 - Initial package From 46e5c26bb5ae89d290364e8d83e7edc0697d8a28 Mon Sep 17 00:00:00 2001 From: sbluhm Date: Wed, 29 Sep 2021 14:31:11 +0200 Subject: [PATCH 02/17] Added java-11-devel build requirement --- xmlpull.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xmlpull.spec b/xmlpull.spec index ba6d322..bb70fdc 100644 --- a/xmlpull.spec +++ b/xmlpull.spec @@ -8,6 +8,7 @@ URL: https://github.com/xmlpull-xpp3/%{name}-xpp3 Source0: %{url}/archive/%{name}-xpp3-parent-%{version}.tar.gz BuildArch: noarch +BuildRequires: java-11-devel BuildRequires: maven-local BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) @@ -33,7 +34,7 @@ find \( -name \*.jar -o -name \*.class \) -delete %build %if 0%{?rhel} -export JAVA_HOME=/usr/lib/jvm/java-11 +export JAVA_HOME=/usr/lib/jvm/java-11 %endif %mvn_build -- -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8 From f1e7ced6eaafc04608977e4477edff1472865e54 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 05:15:58 +0000 Subject: [PATCH 03/17] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmlpull.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlpull.spec b/xmlpull.spec index dd83fe5..2c8f617 100644 --- a/xmlpull.spec +++ b/xmlpull.spec @@ -1,6 +1,6 @@ Name: xmlpull Version: 1.2.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: XML Pull Parsing API License: Public Domain @@ -45,5 +45,8 @@ rm xmlpull/src/main/java/module-info.java %doc %{name}/README.adoc %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 1.2.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Wed Aug 11 2021 Didik Supriadi - 1.2.0-1 - Initial package From 5059a5883da0d7f0bf4a94376bc8365533a8ccbd Mon Sep 17 00:00:00 2001 From: Jiri Date: Sun, 6 Feb 2022 00:46:11 +0100 Subject: [PATCH 04/17] Rebuilt for java-17-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java17 --- xmlpull.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlpull.spec b/xmlpull.spec index 2c8f617..66be128 100644 --- a/xmlpull.spec +++ b/xmlpull.spec @@ -1,6 +1,6 @@ Name: xmlpull Version: 1.2.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: XML Pull Parsing API License: Public Domain @@ -45,6 +45,9 @@ rm xmlpull/src/main/java/module-info.java %doc %{name}/README.adoc %changelog +* Sat Feb 05 2022 Jiri Vanek - 1.2.0-3 +- Rebuilt for java-17-openjdk as system jdk + * Sat Jan 22 2022 Fedora Release Engineering - 1.2.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 52920f6abd539d104c28de1fd22bcff55f7b41ca Mon Sep 17 00:00:00 2001 From: Jiri Date: Fri, 8 Jul 2022 17:02:34 +0200 Subject: [PATCH 05/17] Rebuilt for Drop i686 JDKs https://fedoraproject.org/wiki/Changes/Drop_i686_JDKs --- xmlpull.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/xmlpull.spec b/xmlpull.spec index 66be128..39d5a53 100644 --- a/xmlpull.spec +++ b/xmlpull.spec @@ -1,12 +1,13 @@ Name: xmlpull Version: 1.2.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: XML Pull Parsing API License: Public Domain URL: https://github.com/xmlpull-xpp3/%{name}-xpp3 Source0: %{url}/archive/%{name}-xpp3-parent-%{version}.tar.gz BuildArch: noarch +ExclusiveArch: %{java_arches} noarch BuildRequires: maven-local BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) @@ -45,6 +46,9 @@ rm xmlpull/src/main/java/module-info.java %doc %{name}/README.adoc %changelog +* Fri Jul 08 2022 Jiri Vanek - 1.2.0-4 +- Rebuilt for Drop i686 JDKs + * Sat Feb 05 2022 Jiri Vanek - 1.2.0-3 - Rebuilt for java-17-openjdk as system jdk From e0910394bf095c1b22a985377cc721fb65e0beca Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 13:17:52 +0000 Subject: [PATCH 06/17] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmlpull.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlpull.spec b/xmlpull.spec index 39d5a53..366a035 100644 --- a/xmlpull.spec +++ b/xmlpull.spec @@ -1,6 +1,6 @@ Name: xmlpull Version: 1.2.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: XML Pull Parsing API License: Public Domain @@ -46,6 +46,9 @@ rm xmlpull/src/main/java/module-info.java %doc %{name}/README.adoc %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 1.2.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Fri Jul 08 2022 Jiri Vanek - 1.2.0-4 - Rebuilt for Drop i686 JDKs From 23e480b5c0fe8984c8c3fd47a0e7ca232e6ba6b6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 07:38:08 +0000 Subject: [PATCH 07/17] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmlpull.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlpull.spec b/xmlpull.spec index 366a035..edad28b 100644 --- a/xmlpull.spec +++ b/xmlpull.spec @@ -1,6 +1,6 @@ Name: xmlpull Version: 1.2.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: XML Pull Parsing API License: Public Domain @@ -46,6 +46,9 @@ rm xmlpull/src/main/java/module-info.java %doc %{name}/README.adoc %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 1.2.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Sat Jul 23 2022 Fedora Release Engineering - 1.2.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 31866cef7c08d22efda30177cb2710d96a96e101 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 19:02:03 +0000 Subject: [PATCH 08/17] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmlpull.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlpull.spec b/xmlpull.spec index edad28b..8f0fd29 100644 --- a/xmlpull.spec +++ b/xmlpull.spec @@ -1,6 +1,6 @@ Name: xmlpull Version: 1.2.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: XML Pull Parsing API License: Public Domain @@ -46,6 +46,9 @@ rm xmlpull/src/main/java/module-info.java %doc %{name}/README.adoc %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 1.2.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Sat Jan 21 2023 Fedora Release Engineering - 1.2.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 24dcad45c68f6b48fea876ffb139e7896d171e3c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 09:52:53 +0000 Subject: [PATCH 09/17] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- xmlpull.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlpull.spec b/xmlpull.spec index 8f0fd29..d3a5313 100644 --- a/xmlpull.spec +++ b/xmlpull.spec @@ -1,6 +1,6 @@ Name: xmlpull Version: 1.2.0 -Release: 7%{?dist} +Release: 8%{?dist} Summary: XML Pull Parsing API License: Public Domain @@ -46,6 +46,9 @@ rm xmlpull/src/main/java/module-info.java %doc %{name}/README.adoc %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 1.2.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jul 22 2023 Fedora Release Engineering - 1.2.0-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 759b1d74317ac13309b322d1c05c7d75630f6abc Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Tue, 27 Feb 2024 18:35:47 +0100 Subject: [PATCH 10/17] Rebuilt for java-21-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java21 --- xmlpull.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlpull.spec b/xmlpull.spec index d3a5313..94d6115 100644 --- a/xmlpull.spec +++ b/xmlpull.spec @@ -1,6 +1,6 @@ Name: xmlpull Version: 1.2.0 -Release: 8%{?dist} +Release: 9%{?dist} Summary: XML Pull Parsing API License: Public Domain @@ -46,6 +46,9 @@ rm xmlpull/src/main/java/module-info.java %doc %{name}/README.adoc %changelog +* Tue Feb 27 2024 Jiri Vanek - 1.2.0-9 +- Rebuilt for java-21-openjdk as system jdk + * Sat Jan 27 2024 Fedora Release Engineering - 1.2.0-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From a0cf382526daec5c1e6dc1517d00ae9227e15fa2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 10:13:40 +0000 Subject: [PATCH 11/17] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- xmlpull.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlpull.spec b/xmlpull.spec index 94d6115..b21e602 100644 --- a/xmlpull.spec +++ b/xmlpull.spec @@ -1,6 +1,6 @@ Name: xmlpull Version: 1.2.0 -Release: 9%{?dist} +Release: 10%{?dist} Summary: XML Pull Parsing API License: Public Domain @@ -46,6 +46,9 @@ rm xmlpull/src/main/java/module-info.java %doc %{name}/README.adoc %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 1.2.0-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Tue Feb 27 2024 Jiri Vanek - 1.2.0-9 - Rebuilt for java-21-openjdk as system jdk From 8e59917e583acbcf1ad29d31413e0dd4fd475c0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Thu, 19 Sep 2024 05:41:28 +0000 Subject: [PATCH 12/17] Migrate to SPDX license (temporary ids) This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 Note that this is an SPDX identifier, but it still needs to be migrated to the proper identifiers in the fedora-license-data set. Please follow https://docs.fedoraproject.org/en-US/legal/update-existing-packages/#_public_domain If there will be no comments in two weeks, I will merge this. --- xmlpull.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xmlpull.spec b/xmlpull.spec index b21e602..055c84e 100644 --- a/xmlpull.spec +++ b/xmlpull.spec @@ -3,7 +3,8 @@ Version: 1.2.0 Release: 10%{?dist} Summary: XML Pull Parsing API -License: Public Domain +# Automatically converted from old format: Public Domain - needs further work +License: LicenseRef-Callaway-Public-Domain URL: https://github.com/xmlpull-xpp3/%{name}-xpp3 Source0: %{url}/archive/%{name}-xpp3-parent-%{version}.tar.gz BuildArch: noarch From f9fcb7ed686102f2912e003200f16779ff550a2b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 16:01:27 +0000 Subject: [PATCH 13/17] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- xmlpull.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlpull.spec b/xmlpull.spec index 055c84e..4a160a7 100644 --- a/xmlpull.spec +++ b/xmlpull.spec @@ -1,6 +1,6 @@ Name: xmlpull Version: 1.2.0 -Release: 10%{?dist} +Release: 11%{?dist} Summary: XML Pull Parsing API # Automatically converted from old format: Public Domain - needs further work @@ -47,6 +47,9 @@ rm xmlpull/src/main/java/module-info.java %doc %{name}/README.adoc %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 1.2.0-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Sat Jul 20 2024 Fedora Release Engineering - 1.2.0-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From d264365ec88165d5b6a7b516fb8771500dd64081 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 20:56:08 +0000 Subject: [PATCH 14/17] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- xmlpull.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlpull.spec b/xmlpull.spec index 4a160a7..e701aef 100644 --- a/xmlpull.spec +++ b/xmlpull.spec @@ -1,6 +1,6 @@ Name: xmlpull Version: 1.2.0 -Release: 11%{?dist} +Release: 12%{?dist} Summary: XML Pull Parsing API # Automatically converted from old format: Public Domain - needs further work @@ -47,6 +47,9 @@ rm xmlpull/src/main/java/module-info.java %doc %{name}/README.adoc %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 1.2.0-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Sun Jan 19 2025 Fedora Release Engineering - 1.2.0-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From e6b9dc1246db7192eadfc508483c0c90efe503bb Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Wed, 30 Jul 2025 01:33:40 +0200 Subject: [PATCH 15/17] Rebuilt for java-25-openjdk as preffered jdk https://fedoraproject.org/wiki/Changes/Java25AndNoMoreSystemJdk Note, that since f43, you should be always explicit on what jdk to use. This commit should do exactly that. --- xmlpull.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xmlpull.spec b/xmlpull.spec index e701aef..6d12cd4 100644 --- a/xmlpull.spec +++ b/xmlpull.spec @@ -1,6 +1,6 @@ Name: xmlpull Version: 1.2.0 -Release: 12%{?dist} +Release: 13%{?dist} Summary: XML Pull Parsing API # Automatically converted from old format: Public Domain - needs further work @@ -10,7 +10,7 @@ Source0: %{url}/archive/%{name}-xpp3-parent-%{version}.tar.gz BuildArch: noarch ExclusiveArch: %{java_arches} noarch -BuildRequires: maven-local +BuildRequires: maven-local-openjdk25 BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-source-plugin) @@ -47,6 +47,9 @@ rm xmlpull/src/main/java/module-info.java %doc %{name}/README.adoc %changelog +* Tue Jul 29 2025 jiri vanek - 1.2.0-13 +- Rebuilt for java-25-openjdk as preffered jdk + * Fri Jul 25 2025 Fedora Release Engineering - 1.2.0-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From e712d3bf1b3a69dc87579c627e6dc303fd58ea51 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 20:45:48 +0000 Subject: [PATCH 16/17] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- xmlpull.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlpull.spec b/xmlpull.spec index 6d12cd4..f9fb13c 100644 --- a/xmlpull.spec +++ b/xmlpull.spec @@ -1,6 +1,6 @@ Name: xmlpull Version: 1.2.0 -Release: 13%{?dist} +Release: 14%{?dist} Summary: XML Pull Parsing API # Automatically converted from old format: Public Domain - needs further work @@ -47,6 +47,9 @@ rm xmlpull/src/main/java/module-info.java %doc %{name}/README.adoc %changelog +* Sat Jan 17 2026 Fedora Release Engineering - 1.2.0-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Tue Jul 29 2025 jiri vanek - 1.2.0-13 - Rebuilt for java-25-openjdk as preffered jdk From a173f9120bd3d0edeba66ccbef9f769644e04098 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 09:18:36 +0000 Subject: [PATCH 17/17] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- xmlpull.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlpull.spec b/xmlpull.spec index f9fb13c..be5c478 100644 --- a/xmlpull.spec +++ b/xmlpull.spec @@ -1,6 +1,6 @@ Name: xmlpull Version: 1.2.0 -Release: 14%{?dist} +Release: 15%{?dist} Summary: XML Pull Parsing API # Automatically converted from old format: Public Domain - needs further work @@ -47,6 +47,9 @@ rm xmlpull/src/main/java/module-info.java %doc %{name}/README.adoc %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 1.2.0-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + * Sat Jan 17 2026 Fedora Release Engineering - 1.2.0-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild