Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package slf4j for openSUSE:Factory checked
in at 2024-02-21 17:52:20
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/slf4j (Old)
and /work/SRC/openSUSE:Factory/.slf4j.new.1706 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "slf4j"
Wed Feb 21 17:52:20 2024 rev:32 rq:1148099 version:1.7.36
Changes:
--------
--- /work/SRC/openSUSE:Factory/slf4j/slf4j.changes 2023-06-04
16:41:48.277844843 +0200
+++ /work/SRC/openSUSE:Factory/.slf4j.new.1706/slf4j.changes 2024-02-21
17:52:35.254989242 +0100
@@ -1,0 +2,5 @@
+Tue Feb 20 14:29:19 UTC 2024 - Fridrich Strba <fst...@suse.com>
+
+- Use %patch -P N instead of deprecated %patchN.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ slf4j.spec ++++++
--- /var/tmp/diff_new_pack.P28Fto/_old 2024-02-21 17:52:35.803009078 +0100
+++ /var/tmp/diff_new_pack.P28Fto/_new 2024-02-21 17:52:35.807009222 +0100
@@ -1,7 +1,7 @@
#
# spec file for package slf4j
#
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
# Copyright (c) 2000-2009, JPackage Project
#
# All modifications and additions to the file contributed by third parties
@@ -36,13 +36,11 @@
BuildRequires: apache-commons-logging
BuildRequires: cal10n
BuildRequires: java-devel >= 1.5.0
-BuildRequires: javapackages-local
+BuildRequires: javapackages-local >= 6
BuildRequires: javassist >= 3.4
BuildRequires: reload4j
-Requires: cal10n
-Requires: java
# this is ugly hack, which creates package which requires the same,
-# however slf4j is not splitted between -api and -impl, but pom files are
modeled as it was
+# however slf4j is not splitted between -api and -impl, but pom files are
modeled as if it was
Provides: osgi(slf4j.api)
BuildArch: noarch
@@ -75,7 +73,6 @@
%package jdk14
Summary: SLF4J JDK14 Binding
Group: Development/Libraries/Java
-Requires: mvn(org.slf4j:slf4j-api) = %{version}
%description jdk14
SLF4J JDK14 Binding.
@@ -83,8 +80,6 @@
%package reload4j
Summary: SLF4J LOG4J-12 Binding
Group: Development/Libraries/Java
-Requires: mvn(ch.qos.reload4j:reload4j)
-Requires: mvn(org.slf4j:slf4j-api) = %{version}
Provides: %{name}-log4j12 = %{version}
Obsoletes: %{name}-log4j12 < %{version}
@@ -94,8 +89,6 @@
%package jcl
Summary: SLF4J JCL Binding
Group: Development/Libraries/Java
-Requires: mvn(commons-logging:commons-logging)
-Requires: mvn(org.slf4j:slf4j-api) = %{version}
%description jcl
SLF4J JCL Binding.
@@ -103,7 +96,6 @@
%package ext
Summary: SLF4J Extensions Module
Group: Development/Libraries/Java
-Requires: mvn(org.slf4j:slf4j-api) = %{version}
%description ext
Extensions to the SLF4J API.
@@ -111,7 +103,6 @@
%package -n jcl-over-slf4j
Summary: JCL 1.1.1 implemented over SLF4J
Group: Development/Libraries/Java
-Requires: mvn(org.slf4j:slf4j-api) = %{version}
%description -n jcl-over-slf4j
JCL 1.1.1 implemented over SLF4J.
@@ -119,7 +110,6 @@
%package -n log4j-over-slf4j
Summary: Log4j implemented over SLF4J
Group: Development/Libraries/Java
-Requires: mvn(org.slf4j:slf4j-api) = %{version}
%description -n log4j-over-slf4j
Log4j implemented over SLF4J.
@@ -127,7 +117,6 @@
%package -n jul-to-slf4j
Summary: JUL to SLF4J bridge
Group: Development/Libraries/Java
-Requires: mvn(org.slf4j:slf4j-api) = %{version}
%description -n jul-to-slf4j
JUL to SLF4J bridge.
@@ -141,9 +130,9 @@
%prep
%setup -q -a2
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
+%patch -P 1 -p1
+%patch -P 2 -p1
+%patch -P 3 -p1
find . -name "*.jar" | xargs rm
cp -p %{SOURCE1} APACHE-LICENSE
@@ -173,8 +162,6 @@
# # Reported upstream: http://bugzilla.slf4j.org/show_bug.cgi?id=283
sed -i "/Import-Package/s/$/;resolution:=optional/"
slf4j-api/src/main/resources/META-INF/MANIFEST.MF
-%pom_change_dep -r -f ::::: :::::
-
%build
export CLASSPATH=$(build-classpath reload4j \
commons-logging \
@@ -233,19 +220,11 @@
install -d -m 755 %{buildroot}%{_mavenpomdir}/%{name}
for i in api ext jcl jdk14 reload4j nop simple; do
- %pom_remove_parent slf4j-${i}
- %pom_xpath_inject "pom:project" "
- <groupId>org.slf4j</groupId>
- <version>%{version}</version>" slf4j-${i}
- install -pm 644 slf4j-${i}/pom.xml
%{buildroot}%{_mavenpomdir}/%{name}/${i}.pom
+ %{mvn_install_pom} slf4j-${i}/pom.xml
%{buildroot}%{_mavenpomdir}/%{name}/${i}.pom
done
for i in jcl-over-slf4j jul-to-slf4j log4j-over-slf4j; do
- %pom_remove_parent ${i}
- %pom_xpath_inject "pom:project" "
- <groupId>org.slf4j</groupId>
- <version>%{version}</version>" ${i}
- install -pm 644 ${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/${i}.pom
+ %{mvn_install_pom} ${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/${i}.pom
done
for i in api nop simple; do
