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
This commit is contained in:
parent
03be045a5e
commit
65421b8b00
@ -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
|
Sun Nov 23 04:50:32 UTC 2014 - bwiedemann@suse.com
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package thttpd
|
# 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
|
# All modifications and additions to the file contributed by third parties
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
@ -51,6 +51,8 @@ BuildRequires: automake
|
|||||||
BuildRequires: libtool
|
BuildRequires: libtool
|
||||||
Requires(post): permissions
|
Requires(post): permissions
|
||||||
Provides: http_daemon
|
Provides: http_daemon
|
||||||
|
# both packages provide /usr/bin/htpasswd
|
||||||
|
Conflicts: apache2-utils
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
%if %{with_systemd}
|
%if %{with_systemd}
|
||||||
BuildRequires: systemd
|
BuildRequires: systemd
|
||||||
|
Loading…
Reference in New Issue
Block a user