[rpms/google-gson] epel10: Clean up and try to fix build on eln114

[rpms/google-gson] epel10: Clean up and try to fix build on eln114

[@ 2026-08-17 12:38 UTC (permalink / raw)]

A new commit has been pushed.

Repo   : rpms/google-gson
Branch : epel10
Commit : c13336579b31b76d717bf440f245f566587828cd
Author : Sérgio M. Basto <sergio@serjux.com>
Date   : 2022-01-02T22:51:12+00:00
Stats  : +5/-85 in 3 file(s)
URL    : https://src.fedoraproject.org/rpms/google-gson/c/c13336579b31b76d717bf440f245f566587828cd?branch=epel10

Log:
Clean up and try to fix build on eln114

---
diff --git a/0001-Update-to-latest-version-of-bnd-maven-plugin.patch b/0001-Update-to-latest-version-of-bnd-maven-plugin.patch
deleted file mode 100644
index 7206b82..0000000
--- a/0001-Update-to-latest-version-of-bnd-maven-plugin.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From c2fd092f97e4ec6ee700f134bc1b52b62b8630a2 Mon Sep 17 00:00:00 2001
-From: Mat Booth <mat.booth@redhat.com>
-Date: Thu, 27 Aug 2020 10:27:01 +0100
-Subject: [PATCH 1/4] Update to latest version of bnd-maven-plugin
-
-This version has a couple of advantages:
-
-1) It is aware of module-info.class files, which means we don't
-need to manually override the "Require-Capability" header.
-
-2) External packages used by reflection are now detected, i.e.
-the "sun.misc" package is now added to the "Import-Package"
-header. This is manually given optional resolution since it
-is obviously not present on all JVMs.
-
-3) It also introduces some new useful OSGi headers:
- - Bundle-DocURL (overriden with correct URL for manual)
- - Bundle-License
- - Bundle-SCM
-
-This change also removes unnecessary mention of the felix
-bundle-plugin in the pluginManagement section of the parent pom.
-
-Signed-off-by: Mat Booth <mat.booth@redhat.com>
----
- gson/bnd.bnd | 2 ++
- gson/pom.xml | 2 +-
- pom.xml      | 6 ------
- 3 files changed, 3 insertions(+), 7 deletions(-)
-
-diff --git a/pom.xml b/pom.xml
-index 4774e70..8716014 100644
---- a/pom.xml
-+++ b/pom.xml
-@@ -103,12 +103,6 @@
-           <groupId>org.apache.maven.plugins</groupId>
-           <artifactId>maven-jar-plugin</artifactId>
-         </plugin>
--        <plugin>
--          <groupId>org.apache.felix</groupId>
--          <artifactId>maven-bundle-plugin</artifactId>
--          <version>5.1.2</version>
--          <inherited>true</inherited>
--        </plugin>
-       </plugins>
-     </pluginManagement>
-     <plugins>
--- 
-2.26.2
-

diff --git a/0002-Also-export-internal-packages-in-OSGi-metadata.patch b/0002-Also-export-internal-packages-in-OSGi-metadata.patch
deleted file mode 100644
index d6dab1e..0000000
--- a/0002-Also-export-internal-packages-in-OSGi-metadata.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From ad012fa6acc53560a07d05676aa22d1afc66bf22 Mon Sep 17 00:00:00 2001
-From: Mat Booth <mat.booth@redhat.com>
-Date: Thu, 27 Aug 2020 10:52:58 +0100
-Subject: [PATCH 2/4] Also export internal packages in OSGi metadata
-
----
- gson/bnd.bnd | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/gson/bnd.bnd b/gson/bnd.bnd
-index 7706d8a..8469930 100644
---- a/gson/bnd.bnd
-+++ b/gson/bnd.bnd
-@@ -13,4 +13,7 @@ Import-Package: sun.misc;resolution:=optional,*
-     com.google.gson,\
-     com.google.gson.annotations,\
-     com.google.gson.reflect,\
--    com.google.gson.stream
-+    com.google.gson.stream,\
-+    com.google.gson.internal;x-internal:=true,\
-+    com.google.gson.internal.bind;x-internal:=true,\
-+    com.google.gson.internal.bind.util;x-internal:=true
--- 
-2.26.2
-

diff --git a/google-gson.spec b/google-gson.spec
index 5c5afc7..eeffbbf 100644
--- a/google-gson.spec
+++ b/google-gson.spec
@@ -1,17 +1,11 @@
 Name:           google-gson
 Version:        2.8.8
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Java lib for conversion of Java objects into JSON representation
 License:        ASL 2.0
 URL:            https://github.com/google/gson
 Source0:        https://github.com/google/gson/archive/gson-parent-%{version}.tar.gz
 
-# PR sent upstream: https://github.com/google/gson/pull/1770
-Patch0: 0001-Update-to-latest-version-of-bnd-maven-plugin.patch
-
-# Internal packages are naughtily used by other packages in Fedora
-Patch1: 0002-Also-export-internal-packages-in-OSGi-metadata.patch
-
 # Remove dependency on unavailable templating-maven-plugin
 # Reverts upstream commit https://github.com/google/gson/commit/d84e26d
 Patch3: 0004-This-commit-added-a-dependency-on-templating-maven-p.patch
@@ -21,7 +15,7 @@ BuildArch:      noarch
 BuildRequires:  maven-local
 BuildRequires:  mvn(junit:junit)
 BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
-BuildRequires:  mvn(biz.aQute.bnd:bnd-baseline-maven-plugin)
+BuildRequires:  bnd-maven-plugin
 BuildRequires:  maven-resources-plugin
 
 %description
@@ -38,8 +32,6 @@ This package contains the API documentation for %{name}.
 
 %prep
 %setup -q -n gson-gson-parent-%{version}
-#patch0 -p1
-#patch1 -p1
 %patch3 -p1
 
 # The test EnumWithObfuscatedTest requires the plugins copy-rename-maven-plugin, proguard-maven-plugin and maven-resources-plugin to work correctly because it tests Gson interaction with a class obfuscated by ProGuard.
@@ -80,6 +72,9 @@ rm ./gson/src/test/java/com/google/gson/functional/EnumWithObfuscatedTest.java
 %license LICENSE
 
 %changelog
+* Sun Jan 02 2022 Sérgio Basto <sergio@serjux.com> - 2.8.8-2
+- Clean up and try to fix build on eln114
+
 * Fri Dec 31 2021 Sérgio Basto <sergio@serjux.com> - 2.8.8-1
 - Update google-gson to 2.8.8 (#1964408)