From 79b2fa4134a6a969ed3ce0663640c3028df0a512 Mon Sep 17 00:00:00 2001
From: Coty Sutherland <csutherl@redhat.com>
Date: Fri, 6 Aug 2021 14:27:32 -0400
Subject: [PATCH] Resolves: #1992851 Remove the ap24 subpackage so that users
 can simply install mod_jk

---
 mod_jk.spec                           | 18 +++++-------------
 tests/roles/Test_Setup/tasks/main.yml |  2 +-
 tests/tests.yml                       |  2 +-
 3 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/mod_jk.spec b/mod_jk.spec
index 3e3a49f..6137a24 100644
--- a/mod_jk.spec
+++ b/mod_jk.spec
@@ -48,6 +48,8 @@ Source3:   workers.properties.sample
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Requires: httpd
+
 BuildRequires: httpd-devel
 BuildRequires: apr-devel
 BuildRequires: apr-util-devel
@@ -63,18 +65,7 @@ BuildRequires: xalan-j2 >= 2.7.0
 Tomcat-connectors (mod_jk) is a project that provides web server
 connectors for the Apache Tomcat servlet engine.
 
-%package ap24
-Summary: Tomcat %{pkg_name} connector for Apache 2.4.x
-Group: Internet/WWW/Servers
-Provides: %{pkg_name} = %{epoch}:%{version}-%{release}
-Obsoletes: tomcat-mod
-Obsoletes: %{pkg_name}-ap20 < %{epoch}:%{version}
-Obsoletes: %{pkg_name}-ap22 < %{epoch}:%{version}
-Obsoletes: mod_jk-tools < %{epoch}:%{version}-%{release}
-Requires: httpd >= 2.4.6
-
-%description ap24
-Tomcat %{pkg_name} connector for Apache 2.4.x.
+Obsoletes: %{pkg_name}-ap24 < %{epoch}:%{version}
 
 %package manual
 Summary: Tomcat %{pkg_name} connector manual
@@ -150,7 +141,7 @@ command="s|/usr/local/bin\b|%{_bindir}|"
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
 
-%files ap24
+%files
 %{!?apxs: %{expand: %%define apxs %{_bindir}/apxs}}
 %define aplibdir %(%{apxs} -q LIBEXECDIR 2>/dev/null)
 %defattr(-,root,root,-)
@@ -170,6 +161,7 @@ command="s|/usr/local/bin\b|%{_bindir}|"
 %changelog
 * Mon Aug 16 2021 Coty Sutherland <csutherl@redhat.com> - 1.2.48-20
 - Cleanup spec file and remove .redhat-N suffix from release
+- Remove ap24 subpackage since we only need to build for one version of httpd
 
 * Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 0:1.2.48-19.redhat_1.1
 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
diff --git a/tests/roles/Test_Setup/tasks/main.yml b/tests/roles/Test_Setup/tasks/main.yml
index 4579c26..726aa07 100644
--- a/tests/roles/Test_Setup/tasks/main.yml
+++ b/tests/roles/Test_Setup/tasks/main.yml
@@ -3,7 +3,7 @@
 - name: Install required packages
   dnf:
     name: >
-      httpd, mod_jk-ap24
+      httpd, mod_jk
 
 - name: Configure mod_jk.conf
   command: mv /etc/httpd/conf.d/mod_jk.conf.sample /etc/httpd/conf.d/mod_jk.conf
diff --git a/tests/tests.yml b/tests/tests.yml
index 9145c91..bceff2b 100644
--- a/tests/tests.yml
+++ b/tests/tests.yml
@@ -16,7 +16,7 @@
         dir: .
         run: "grep -e \"mod_jk/.* configured -- resuming normal operations\" /var/log/httpd/error_log"
     required_packages:
-    - mod_jk-ap24
+    - mod_jk
     - httpd
     required_services:
     - httpd