diff --git a/thttpd.changes b/thttpd.changes index c34e3bf..ef16735 100644 --- a/thttpd.changes +++ b/thttpd.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Sep 17 14:10:46 UTC 2015 - vcizek@suse.com + +- added Conflicts: apache2-example-pages + * both packages provide /srv/www/htdocs/index.html + ------------------------------------------------------------------- Sun Jul 5 09:43:36 UTC 2015 - vcizek@suse.com diff --git a/thttpd.spec b/thttpd.spec index 39e2ce7..f8dbde4 100644 --- a/thttpd.spec +++ b/thttpd.spec @@ -56,6 +56,8 @@ Requires(post): permissions Recommends: logrotate # both packages provide /usr/bin/htpasswd Conflicts: apache2-utils +# both packages provide /srw/www/htdocs/index.html +Conflicts: apache2-example-pages Provides: http_daemon BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %{with_systemd}