From 26e56a0a4f5e03a7341198f926cacf9899f12e153afafd4a35a2bcfcb379862c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=C4=9Bzslav=20=C4=8C=C3=AD=C5=BEek?= Date: Wed, 14 Oct 2015 12:18:32 +0000 Subject: [PATCH] Accepting request 331803 from home:vitezslav_cizek:branches:server:http - added Conflicts: apache2-example-pages * both packages provide /srv/www/htdocs/index.html OBS-URL: https://build.opensuse.org/request/show/331803 OBS-URL: https://build.opensuse.org/package/show/server:http/thttpd?expand=0&rev=33 --- thttpd.changes | 6 ++++++ thttpd.spec | 2 ++ 2 files changed, 8 insertions(+) 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}