From 65421b8b00f1c5833065941a88c83c3889f11f9eac63236569ffb522355f570c Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dleuenberger@suse.com>
Date: Tue, 9 Jun 2015 12:55:01 +0000
Subject: [PATCH] Accepting request 310309 from
 home:vitezslav_cizek:branches:server:http

- added Conflicts: apache2-utils
  * both packages provide /usr/bin/htpasswd
  * see comments in https://build.opensuse.org/request/show/310178

OBS-URL: https://build.opensuse.org/request/show/310309
OBS-URL: https://build.opensuse.org/package/show/server:http/thttpd?expand=0&rev=29
---
 thttpd.changes | 7 +++++++
 thttpd.spec    | 4 +++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/thttpd.changes b/thttpd.changes
index 467dd0f..4d38641 100644
--- a/thttpd.changes
+++ b/thttpd.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Jun  4 15:09:12 UTC 2015 - vcizek@suse.com
+
+- added Conflicts: apache2-utils
+  * both packages provide /usr/bin/htpasswd
+  * see comments in https://build.opensuse.org/request/show/310178
+
 -------------------------------------------------------------------
 Sun Nov 23 04:50:32 UTC 2014 - bwiedemann@suse.com
 
diff --git a/thttpd.spec b/thttpd.spec
index 73af16b..9eba1fc 100644
--- a/thttpd.spec
+++ b/thttpd.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package thttpd
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -51,6 +51,8 @@ BuildRequires:  automake
 BuildRequires:  libtool
 Requires(post): permissions
 Provides:       http_daemon
+# both packages provide /usr/bin/htpasswd
+Conflicts:      apache2-utils
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if %{with_systemd}
 BuildRequires:  systemd