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
This commit is contained in:
Vítězslav Čížek 2015-10-14 12:18:32 +00:00 committed by Git OBS Bridge
parent bee2df2210
commit 26e56a0a4f
2 changed files with 8 additions and 0 deletions

View File

@ -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

View File

@ -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}