diff --git a/apache2.changes b/apache2.changes index 6d68323..685041a 100644 --- a/apache2.changes +++ b/apache2.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Dec 17 17:22:23 UTC 2020 - pgajdos@suse.com + +- obsolete apache2-example-page and obsolete/provide apache2-doc + [bsc#180075] + ------------------------------------------------------------------- Mon Dec 14 11:19:46 UTC 2020 - Arjen de Korte diff --git a/apache2.spec b/apache2.spec index 3b756e8..48993fa 100644 --- a/apache2.spec +++ b/apache2.spec @@ -281,6 +281,7 @@ Requires: logrotate Provides: %{apache_mmn} Provides: httpd Provides: suse_maintenance_mmn_%{suse_maintenance_mmn} +Obsoletes: apache2-example-pages Requires(pre): group(www) Requires(pre): user(wwwrun) %{?systemd_ordering} @@ -296,6 +297,10 @@ Requires: apr-util-devel Requires: gcc Provides: httpd-devel = %{version} %endif +%if "%{flavor}" == "manual" +Provides: apache2-doc = %{version} +Obsoletes: apache2-doc <= %{version} +%endif %if "%{mpm}" != "" Requires(pre): permissions Requires(post): %fillup_prereq @@ -909,7 +914,7 @@ exit 0 %{manualdir} %dir %{sysconfdir} %dir %{sysconfdir}/conf.d/ -%{sysconfdir}/conf.d/manual.conf +%config %{sysconfdir}/conf.d/manual.conf %endif #