Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package felix-bundlerepository for
openSUSE:Factory checked in at 2024-02-21 17:58:29
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/felix-bundlerepository (Old)
and /work/SRC/openSUSE:Factory/.felix-bundlerepository.new.1706 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "felix-bundlerepository"
Wed Feb 21 17:58:29 2024 rev:2 rq:1148707 version:2.0.10
Changes:
--------
---
/work/SRC/openSUSE:Factory/felix-bundlerepository/felix-bundlerepository.changes
2022-03-18 16:43:15.745229720 +0100
+++
/work/SRC/openSUSE:Factory/.felix-bundlerepository.new.1706/felix-bundlerepository.changes
2024-02-21 17:58:37.416092142 +0100
@@ -1,0 +2,5 @@
+Wed Feb 21 09:04:03 UTC 2024 - Fridrich Strba <[email protected]>
+
+- Use %patch -P N instead of deprecated %patchN.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ felix-bundlerepository.spec ++++++
--- /var/tmp/diff_new_pack.nGVHI0/_old 2024-02-21 17:58:37.900109644 +0100
+++ /var/tmp/diff_new_pack.nGVHI0/_new 2024-02-21 17:58:37.900109644 +0100
@@ -1,7 +1,7 @@
#
# spec file for package felix-bundlerepository
#
-# Copyright (c) 2022 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
@@ -33,16 +33,11 @@
BuildRequires: felix-osgi-obr
BuildRequires: felix-shell
BuildRequires: felix-utils
-BuildRequires: javapackages-local
+BuildRequires: javapackages-local >= 6
BuildRequires: kxml
BuildRequires: osgi-compendium
BuildRequires: osgi-core
BuildRequires: xpp3
-Requires: mvn(net.sf.kxml:kxml2)
-Requires: mvn(org.apache.felix:org.apache.felix.utils)
-Requires: mvn(org.osgi:osgi.cmpn)
-Requires: mvn(org.osgi:osgi.core)
-Requires: mvn(xpp3:xpp3)
BuildArch: noarch
%description
@@ -57,8 +52,8 @@
%prep
%setup -q -n %{bundle}-%{version}
cp %{SOURCE1} build.xml
-%patch1 -p1
-%patch2 -p1
+%patch -P 1 -p1
+%patch -P 2 -p1
%pom_remove_plugin :maven-source-plugin
@@ -76,9 +71,6 @@
%pom_remove_dep :org.osgi.compendium
%pom_add_dep org.osgi:osgi.cmpn
-%pom_remove_parent
-%pom_xpath_inject pom:project "<groupId>org.apache.felix</groupId>"
-
%build
mkdir -p lib
build-jar-repository -s lib osgi-core osgi-compendium xpp3 kxml felix
@@ -91,7 +83,7 @@
# 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
