SOURCES/0009-Fix-tests.patch

@@ -22,7 +22,7 @@ index 74a7139..9149da2 100644
 -  <property name="javamail.jar" location="${m2_repo}/javax/mail/mail/1.4.3/mail-1.4.3.jar"/>
 -  <property name="activation.jar" location="${m2_repo}/javax/activation/activation/1.1/activation-1.1.jar"/>
 +  <property name="javamail.jar" location="lib/mail.jar"/>
-+  <property name="activation.jar" location="lib/android-activation.jar"/>
++  <property name="activation.jar" location="lib/mail.jar"/>
    <property name="junit.version" value="3.8.1"/>
 -  <property name="junit.jar" location="${m2_repo}/junit/junit/${junit.version}/junit-${junit.version}.jar"/>
 +  <property name="junit.jar" location="lib/junit.jar"/>

SOURCES/sun-reflect-filter-jdk11.patch

@@ -1,15 +0,0 @@
---- log4j-1_2_17/tests/src/java/org/apache/log4j/util/SunReflectFilter.java~	2012-05-26 12:00:25.000000000 +0200
-+++ log4j-1_2_17/tests/src/java/org/apache/log4j/util/SunReflectFilter.java	2019-11-05 10:04:05.622551632 +0100
-@@ -37,6 +37,12 @@
-     if (in.indexOf("at java.lang.reflect.") >= 0) {
-       return null;
-     }
-+    if (in.indexOf("at java.base/jdk.internal.reflect.") >= 0) {
-+      return null;
-+    }
-+    if (in.indexOf("at java.base/java.lang.reflect.") >= 0) {
-+      return null;
-+    }
-     if (in.indexOf("Compiled Code") >= 0) {
-         if(in.indexOf("junit.framework.TestSuite") >= 0) {
-             return util.substitute("s/Compiled Code/TestSuite.java:XXX/", in);

SPECS/log4j12.spec

@@ -1,9 +1,10 @@
 %global archiversion %(echo %{version} | tr . _ )
 
+%bcond_without dtd
 
 Name:          log4j12
 Version:       1.2.17
-Release:       24%{?dist}
+Release:       22%{?dist}
 Summary:       Java logging package
 License:       ASL 2.0
 URL:           http://logging.apache.org/log4j/1.2/
@@ -16,10 +17,9 @@ Patch0:        0001-logfactor5-changed-userdir.patch
 Patch1:        0009-Fix-tests.patch
 Patch2:        0010-Fix-javadoc-link.patch
 Patch3:        0001-Backport-fix-for-CVE-2017-5645.patch
-Patch4:        sun-reflect-filter-jdk11.patch
 
 BuildRequires: maven-local
-BuildRequires: mvn(com.sun.mail:android-activation)
+BuildRequires: mvn(ant-contrib:ant-contrib)
 BuildRequires: mvn(javax.mail:mail)
 BuildRequires: mvn(junit:junit)
 BuildRequires: mvn(org.apache.ant:ant-junit)
@@ -30,6 +30,7 @@ BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin)
 BuildRequires: mvn(org.apache.maven.plugins:maven-assembly-plugin)
 BuildRequires: mvn(oro:oro)
 
+Obsoletes:     log4j <= 0:1.2.17-14
 
 %description
 Log4j is a tool to help the programmer output log statements to a
@@ -53,7 +54,6 @@ rm -rf docs/api
 %patch1 -p1 -b .fix-tests
 %patch2 -p1 -b .xlink-javadoc
 %patch3 -p1
-%patch4 -p1
 
 # Remove unavailable plugin
 %pom_remove_plugin :clirr-maven-plugin
@@ -67,9 +67,6 @@ rm -rf docs/api
 # Remove openejb from dependencies
 %pom_remove_dep org.apache.openejb:javaee-api
 
-%pom_remove_dep :ant-contrib
-%pom_remove_dep sun.jdk:tools
-
 # Fix ant gId
 sed -i.ant "s|groupId>ant<|groupId>org.apache.ant<|g" pom.xml
 
@@ -100,6 +97,14 @@ for i in contribs/JimMoore/mail*;do
     mv new "$i"
 done
 
+# Needed by tests
+mkdir -p tests/lib/
+(cd tests/lib/
+  ln -s `build-classpath jakarta-oro`
+  ln -s `build-classpath javamail/mail`
+  ln -s `build-classpath junit`
+)
+
 %mvn_compat_version log4j:log4j 1.2.17 1.2.16 1.2.15 1.2.14 1.2.13 1.2.12 12
 # Remove Microsoft Windows platform specific files
 rm -r src/main/java/org/apache/log4j/nt/NTEventLogAppender.java \
@@ -112,38 +117,68 @@ sed -i '/TelnetAppenderTest/d' tests/src/java/org/apache/log4j/CoreTestSuite.jav
 %mvn_file log4j:log4j log4j %{name}
 
 %build
-# Needed by tests
-mkdir -p tests/lib/
-(cd tests/lib/
-  ln -s `build-classpath jakarta-oro`
-  ln -s `build-classpath javamail/mail`
-  ln -s `build-classpath javamail/android-activation`
-  ln -s `build-classpath junit`
-)
+
 %mvn_build
 
 %install
 %mvn_install -X
 
 # log4j-1 symlink for use with build-classpath et al.
-install -d -m 755 %{buildroot}%{_javadir}/
 ln -s log4j-%{version}.jar %{buildroot}%{_javadir}/log4j-1.jar
 
+%if %{with dtd}
+# DTD and the SGML catalog (XML catalog handled in scriptlets)
+install -pD -T -m 644 src/main/javadoc/org/apache/log4j/xml/doc-files/log4j.dtd \
+  %{buildroot}%{_datadir}/sgml/log4j/log4j.dtd
+install -pD -T -m 644 %{SOURCE1} \
+  %{buildroot}%{_datadir}/sgml/log4j/catalog
+
+%post
+# Note that we're using versioned catalog, so this is always ok.
+if [ -x %{_bindir}/install-catalog -a -d %{_sysconfdir}/sgml ]; then
+  %{_bindir}/install-catalog --add \
+    %{_sysconfdir}/sgml/log4j-%{version}-%{release}.cat \
+    %{_datadir}/sgml/log4j/catalog > /dev/null || :
+fi
+if [ -x %{_bindir}/xmlcatalog -a -w %{_sysconfdir}/xml/catalog ]; then
+  %{_bindir}/xmlcatalog --noout --add public "-//APACHE//DTD LOG4J 1.2//EN" \
+    file://%{_datadir}/sgml/log4j/log4j.dtd %{_sysconfdir}/xml/catalog \
+    > /dev/null
+  %{_bindir}/xmlcatalog --noout --add system log4j.dtd \
+    file://%{_datadir}/sgml/log4j/log4j.dtd %{_sysconfdir}/xml/catalog \
+    > /dev/null || :
+fi
+
+%preun
+if [ $1 -eq 0 ]; then
+  if [ -x %{_bindir}/xmlcatalog -a -w %{_sysconfdir}/xml/catalog ]; then
+    %{_bindir}/xmlcatalog --noout --del \
+      file://%{_datadir}/sgml/log4j/log4j.dtd \
+      %{_sysconfdir}/xml/catalog > /dev/null || :
+  fi
+fi
+
+%postun
+# Note that we're using versioned catalog, so this is always ok.
+if [ -x %{_bindir}/install-catalog -a -d %{_sysconfdir}/sgml ]; then
+  %{_bindir}/install-catalog --remove \
+    %{_sysconfdir}/sgml/log4j-%{version}-%{release}.cat \
+    %{_datadir}/sgml/log4j/catalog > /dev/null || :
+fi
+
+%endif # with dtd
 
 %files -f .mfiles
 %{_javadir}/log4j-1.jar
+%if %{with dtd}
+%{_datadir}/sgml/log4j
+%endif
 %license LICENSE NOTICE
 
 %files javadoc -f .mfiles-javadoc
 %license LICENSE NOTICE
 
 %changelog
-* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2.17-24
-- Mass rebuild for javapackages-tools 201902
-
-* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2.17-23
-- Mass rebuild for javapackages-tools 201901
-
 * Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.17-22
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild