From ea8b5e765e8c600c01b5f053bc82468c8b45d2b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Thu, 9 Sep 2021 08:32:18 +0200
Subject: [PATCH] Add Obsoletes for removed apache-log4j subpackage to fix
 upgrades

---
 ant.spec | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/ant.spec b/ant.spec
index ff33893..a6730c4 100644
--- a/ant.spec
+++ b/ant.spec
@@ -87,6 +87,10 @@ Requires:       %{name}-lib = %{version}-%{release}
 # /usr/share/java-utils/java-functions
 Requires:       javapackages-tools
 
+# Subpackage was removed, and would prevent upgrades because it
+# requires the exact old ant version.
+Obsoletes:      ant-apache-log4j < 1.10.9-5
+
 BuildArch:      noarch
 
 %description
@@ -636,6 +640,9 @@ LC_ALL=C.UTF-8 %{ant} test
 # -----------------------------------------------------------------------------
 
 %changelog
+* Thu Sep  9 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1.10.11-1
+- Add Obsoletes for removed apache-log4j subpackage to fix upgrades
+
 * Wed Aug 11 2021 Marian Koncek <mkoncek@redhat.com> - 1.10.11-1
 - Update to upstream version 1.10.11