forked from pool/reload4j
Accepting request 957132 from Java:packages
Fine-tune Obsoletes/Provides OBS-URL: https://build.opensuse.org/request/show/957132 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/reload4j?expand=0&rev=2
This commit is contained in:
commit
2cb6224c0b
11
reload4j-java1.patch
Normal file
11
reload4j-java1.patch
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
--- reload4j-1.2.19/src/main/java/org/apache/log4j/MDC.java 2022-02-23 08:05:01.051452323 +0100
|
||||||
|
+++ reload4j-1.2.19/src/main/java/org/apache/log4j/MDC.java 2022-02-23 08:05:39.546646231 +0100
|
||||||
|
@@ -47,7 +47,7 @@
|
||||||
|
|
||||||
|
static final int HT_SIZE = 7;
|
||||||
|
|
||||||
|
- // boolean java1;
|
||||||
|
+ boolean java1;
|
||||||
|
|
||||||
|
ThreadLocalMap tlm;
|
||||||
|
|
@ -1,3 +1,15 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Feb 23 07:08:03 UTC 2022 - Fridrich Strba <fstrba@suse.com>
|
||||||
|
|
||||||
|
- Added patch:
|
||||||
|
* reload4j-java1.patch
|
||||||
|
+ Some projects using log4j12 expect the org.apache.log4j.MDC
|
||||||
|
class to have internal boolean variable java1. We add it
|
||||||
|
there just to avoid runtime incompatibilities as a log4j12
|
||||||
|
drop-in replacement.
|
||||||
|
- Add Provides and Obsoletes to the javadoc package in order to
|
||||||
|
transition smoothly out of log4j12-javadoc and log4j12-manual
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue Feb 22 08:12:11 UTC 2022 - Fridrich Strba <fstrba@suse.com>
|
Tue Feb 22 08:12:11 UTC 2022 - Fridrich Strba <fstrba@suse.com>
|
||||||
|
|
||||||
|
@ -26,6 +26,7 @@ Group: Development/Libraries/Java
|
|||||||
URL: https://reload4j.qos.ch/
|
URL: https://reload4j.qos.ch/
|
||||||
Source0: %{name}-%{version}.tar.xz
|
Source0: %{name}-%{version}.tar.xz
|
||||||
Source1: %{name}-build.xml
|
Source1: %{name}-build.xml
|
||||||
|
Patch0: %{name}-java1.patch
|
||||||
BuildRequires: ant
|
BuildRequires: ant
|
||||||
BuildRequires: fdupes
|
BuildRequires: fdupes
|
||||||
BuildRequires: geronimo-jms-1_1-api
|
BuildRequires: geronimo-jms-1_1-api
|
||||||
@ -62,12 +63,16 @@ make changes to source code.
|
|||||||
%package javadoc
|
%package javadoc
|
||||||
Summary: Javadoc for %{name}
|
Summary: Javadoc for %{name}
|
||||||
Group: Documentation/HTML
|
Group: Documentation/HTML
|
||||||
|
Obsoletes: log4j12-javadoc < %{version}
|
||||||
|
Obsoletes: log4j12-manual < %{version}
|
||||||
|
Provides: log4j12-javadoc = %{version}
|
||||||
|
|
||||||
%description javadoc
|
%description javadoc
|
||||||
This package contains the API documentation for %{name}.
|
This package contains the API documentation for %{name}.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
|
%patch0 -p1
|
||||||
cp %{SOURCE1} build.xml
|
cp %{SOURCE1} build.xml
|
||||||
mkdir -p lib
|
mkdir -p lib
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user