Adding explicit versioning to Obsoletes. Resolves: rhbz#1963135

This commit is contained in:
George Zaronikas 2021-08-24 14:50:00 +03:00
parent 9ce8e2b90d
commit 6c9054c2fc

View File

@ -30,7 +30,7 @@
# Update commitid and serial when new sources and release version are available # Update commitid and serial when new sources and release version are available
%global commitid 1c14fc065bc133887fdde55cab954691b3dc3aac %global commitid 1c14fc065bc133887fdde55cab954691b3dc3aac
%global serial 21 %global serial 22
Name: mod_jk Name: mod_jk
Epoch: 0 Epoch: 0
@ -60,7 +60,7 @@ BuildRequires: java-devel >= 1.6.0
BuildRequires: jpackage-utils >= 0:1.5.38 BuildRequires: jpackage-utils >= 0:1.5.38
BuildRequires: libtool BuildRequires: libtool
BuildRequires: xalan-j2 >= 2.7.0 BuildRequires: xalan-j2 >= 2.7.0
Obsoletes: %{pkg_name}-ap24 < %{epoch}:%{version} Obsoletes: mod_jk-ap24 < 0:1.2.48-21
%description %description
Tomcat-connectors (mod_jk) is a project that provides web server Tomcat-connectors (mod_jk) is a project that provides web server
@ -158,6 +158,10 @@ command="s|/usr/local/bin\b|%{_bindir}|"
%endif %endif
%changelog %changelog
* Tue Aug 24 2021 George Zaronikas <gzaronik@redhat.com> - 1.2.48-22
- Specifying exact NVR in Obsoletes to avoid conflict with -ap24 subpackage
- Resolves: #1963135
* Wed Aug 18 2021 George Zaronikas <gzaronik@redhat.com> - 1.2.48-21 * Wed Aug 18 2021 George Zaronikas <gzaronik@redhat.com> - 1.2.48-21
- Moving Obsoletes out of pkg description - Moving Obsoletes out of pkg description
- Resolves: #1963135 - Resolves: #1963135