diff --git a/SPECS/httpd24.spec b/SPECS/httpd24.spec index 979ba73..b347f01 100644 --- a/SPECS/httpd24.spec +++ b/SPECS/httpd24.spec @@ -11,7 +11,7 @@ Summary: Package that installs %scl Name: %scl_name Version: 1.1 -Release: 4%{?dist} +Release: 9%{?dist} License: GPLv2+ Group: Applications/File Source0: README @@ -36,6 +36,19 @@ This is the main package for %scl Software Collection. Summary: Package that handles %scl Software Collection. Requires: scl-utils Requires(post): policycoreutils-python +# Remove httpd24-apr and httpd24-apr-util from system. +# https://bugzilla.redhat.com/show_bug.cgi?id=1088194 +Obsoletes: %{scl_prefix}apr <= 1.5.1-1%{?dist} +Obsoletes: %{scl_prefix}apr-devel <= 1.5.1-1%{?dist} +Obsoletes: %{scl_prefix}apr-util <= 1.5.4-1%{?dist} +Obsoletes: %{scl_prefix}apr-util-devel <= 1.5.4-1%{?dist} +Obsoletes: %{scl_prefix}apr-util-pgsql <= 1.5.4-1%{?dist} +Obsoletes: %{scl_prefix}apr-util-mysql <= 1.5.4-1%{?dist} +Obsoletes: %{scl_prefix}apr-util-sqlite <= 1.5.4-1%{?dist} +Obsoletes: %{scl_prefix}apr-util-odbc <= 1.5.4-1%{?dist} +Obsoletes: %{scl_prefix}apr-util-ldap <= 1.5.4-1%{?dist} +Obsoletes: %{scl_prefix}apr-util-openssl <= 1.5.4-1%{?dist} +Obsoletes: %{scl_prefix}apr-util-nss <= 1.5.4-1%{?dist} %description runtime Package shipping essential scripts to work with %scl Software Collection. @@ -154,6 +167,15 @@ selinuxenabled && load_policy || : %{_root_sysconfdir}/rpm/macros.%{scl_name_base}-scldevel %changelog +* Tue Feb 03 2015 Jan Kaluza - 1.1.9 +- use httpd24-apr and httpd24-apr-util from system on RHEL7 (#1187646) + +* Mon Feb 02 2015 Jan Kaluza - 1.1.8 +- use httpd24-apr and httpd24-apr-util even on RHEL7 (#1187646) + +* Mon Jan 05 2015 Jan Kaluza - 1.1-7 +- obsolete httpd24-apr and http24-apr-util (#1088194) + * Mon Mar 31 2014 Honza Horak - 1.1-4 - Fix path typo in README Related: #1061446