From f0e5615ecac60d19c57afc82012891a572d0ace406c5963fdfe026f0be3e3d6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= <adrian@suse.de>
Date: Tue, 25 Feb 2025 19:19:50 +0100
Subject: [PATCH] Sync from SUSE:SLFO:Main felix-osgi-obr revision
 ecd76aa6869f7c9a7067abdf9f2716b3

---
 felix-osgi-obr.changes |  5 +++++
 felix-osgi-obr.spec    | 12 ++++--------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/felix-osgi-obr.changes b/felix-osgi-obr.changes
index df826f1..1775076 100644
--- a/felix-osgi-obr.changes
+++ b/felix-osgi-obr.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Oct  2 15:38:50 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Spec file cleanup
+
 -------------------------------------------------------------------
 Thu Sep 21 05:40:26 UTC 2023 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/felix-osgi-obr.spec b/felix-osgi-obr.spec
index ba33d99..0841b8b 100644
--- a/felix-osgi-obr.spec
+++ b/felix-osgi-obr.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package felix-osgi-obr
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -28,9 +28,8 @@ Source0:        http://archive.apache.org/dist/felix/org.osgi.service.obr-%{vers
 Source1:        %{bundle}-build.xml
 BuildRequires:  ant
 BuildRequires:  fdupes
-BuildRequires:  javapackages-local
+BuildRequires:  javapackages-local >= 6
 BuildRequires:  osgi-core
-Requires:       mvn(org.osgi:osgi.core)
 BuildArch:      noarch
 
 %description
@@ -47,16 +46,13 @@ API documentation for %{name}.
 %setup -q -n %{bundle}-%{version}
 cp %{SOURCE1} build.xml
 
-%pom_remove_parent
-%pom_xpath_inject pom:project "<groupId>org.apache.felix</groupId>"
-
 # Use latest OSGi implementation
 %pom_change_dep :org.osgi.core org.osgi:osgi.core
 
 %build
 mkdir -p lib
 build-jar-repository -s lib osgi-core
-%{ant} package javadoc
+ant package javadoc
 
 %install
 # jar
@@ -65,7 +61,7 @@ install -m 644 target/%{bundle}-%{version}.jar %{buildroot}%{_javadir}/felix/%{b
 
 # pom
 install -d -m 755 %{buildroot}%{_mavenpomdir}/felix
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/felix/%{bundle}.pom
+%{mvn_install_pom} pom.xml %{buildroot}%{_mavenpomdir}/felix/%{bundle}.pom
 %add_maven_depmap felix/%{bundle}.pom felix/%{bundle}.jar
 
 # javadoc