pool/slf4j
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/Java:packages/slf4j?expand=0&rev=63

Browse Source
This commit is contained in:
Fridrich Strba 2022-02-23 07:29:44 +00:00 committed by Git OBS Bridge
parent a5c077e3d2
commit 743f9474a5
5 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
slf4j-reload4j.patch
View File

@ -1,10 +0,0 @@
--- slf4j-v_1.7.32/slf4j-log4j12/src/main/java/org/apache/log4j/MDCFriend.java 2021-07-29 20:27:41.000000000 +0200
+++ slf4j-v_1.7.32/slf4j-log4j12/src/main/java/org/apache/log4j/MDCFriend.java 2022-02-22 10:46:34.151501274 +0100
@@ -10,7 +10,6 @@
public static void fixForJava9() {
if (MDC.mdc.tlm == null) {
MDC.mdc.tlm = new ThreadLocalMap();
- MDC.mdc.java1 = false;
setRemoveMethod(MDC.mdc);
}

7
slf4j-sources.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Feb 23 07:17:10 UTC 2022 - Fridrich Strba <fstrba@suse.com>
- Removed patch:
* slf4j-reload4j.patch
+ the incompatibility is now handled in reload4j itself
-------------------------------------------------------------------
Tue Feb 22 20:45:12 UTC 2022 - Fridrich Strba <fstrba@suse.com>

2
slf4j-sources.spec
View File

@ -29,7 +29,6 @@ URL: https://www.slf4j.org/
Source0: %{base_name}-%{version}.tar.xz
Source1: http://www.apache.org/licenses/LICENSE-2.0.txt
Patch2: slf4j-commons-lang3.patch
Patch3: slf4j-reload4j.patch
BuildRequires: javapackages-local
BuildArch: noarch
@ -39,7 +38,6 @@ SLF4J Source JARs.
%prep
%setup -q -n %{base_name}-%{version}
%patch2 -p1
%patch3 -p1
find . -name "*.jar" | xargs rm
cp -p %{SOURCE1} APACHE-LICENSE

7
slf4j.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Feb 23 07:17:10 UTC 2022 - Fridrich Strba <fstrba@suse.com>
- Removed patch:
* slf4j-reload4j.patch
+ the incompatibility is now handled in reload4j itself
-------------------------------------------------------------------
Tue Feb 22 20:45:12 UTC 2022 - Fridrich Strba <fstrba@suse.com>

2
slf4j.spec
View File

@ -30,7 +30,6 @@ Source1: http://www.apache.org/licenses/LICENSE-2.0.txt
Source2: build.xml.tar.xz
Patch1: build-remove-slf4j_api-binder.patch
Patch2: slf4j-commons-lang3.patch
Patch3: slf4j-reload4j.patch
BuildRequires: ant >= 1.6.5
BuildRequires: ant-junit >= 1.6.5
BuildRequires: apache-commons-lang3
@ -137,7 +136,6 @@ JUL to SLF4J bridge.
%setup -q -n %{name}-%{version} -a2
%patch1 -p1
%patch2 -p1
%patch3 -p1
find . -name "*.jar" | xargs rm
cp -p %{SOURCE1} APACHE-LICENSE