Updating link to change in openSUSE:Factory/slf4j revision 26.0

OBS-URL: https://build.opensuse.org/package/show/Java:packages/slf4j?expand=0&rev=f7b33317962a4e50fee78afebaabcd2d
This commit is contained in:
OBS User buildservice-autocommit 2022-02-23 15:25:49 +00:00 committed by Git OBS Bridge
parent 743f9474a5
commit ff7521d9b5
3 changed files with 14 additions and 0 deletions

10
slf4j-reload4j.patch Normal file
View File

@ -0,0 +1,10 @@
--- 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);
}

View File

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

View File

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