diff --git a/reload4j-java1.patch b/reload4j-java1.patch new file mode 100644 index 0000000..99eb9d5 --- /dev/null +++ b/reload4j-java1.patch @@ -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; + diff --git a/reload4j.changes b/reload4j.changes index 3ec718c..d8c8104 100644 --- a/reload4j.changes +++ b/reload4j.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Wed Feb 23 07:08:03 UTC 2022 - Fridrich Strba + +- 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 diff --git a/reload4j.spec b/reload4j.spec index 26af389..ef554e2 100644 --- a/reload4j.spec +++ b/reload4j.spec @@ -26,6 +26,7 @@ Group: Development/Libraries/Java URL: https://reload4j.qos.ch/ Source0: %{name}-%{version}.tar.xz Source1: %{name}-build.xml +Patch0: %{name}-java1.patch BuildRequires: ant BuildRequires: fdupes BuildRequires: geronimo-jms-1_1-api @@ -62,12 +63,16 @@ make changes to source code. %package javadoc Summary: Javadoc for %{name} Group: Documentation/HTML +Obsoletes: log4j12-javadoc < %{version} +Obsoletes: log4j12-manual < %{version} +Provides: log4j12-javadoc = %{version} %description javadoc This package contains the API documentation for %{name}. %prep %setup -q +%patch0 -p1 cp %{SOURCE1} build.xml mkdir -p lib