Hello community, here is the log from the commit of package thttpd for openSUSE:Factory checked in at 2015-06-10 09:15:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/thttpd (Old) and /work/SRC/openSUSE:Factory/.thttpd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "thttpd" Changes: -------- --- /work/SRC/openSUSE:Factory/thttpd/thttpd.changes 2014-11-26 10:33:56.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.thttpd.new/thttpd.changes 2015-06-10 09:15:27.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Jun 4 15:09:12 UTC 2015 - vci...@suse.com + +- added Conflicts: apache2-utils + * both packages provide /usr/bin/htpasswd + * see comments in https://build.opensuse.org/request/show/310178 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ thttpd.spec ++++++ --- /var/tmp/diff_new_pack.jKwGy2/_old 2015-06-10 09:15:28.000000000 +0200 +++ /var/tmp/diff_new_pack.jKwGy2/_new 2015-06-10 09:15:28.000000000 +0200 @@ -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: 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
