@@ -101,7+104,6 @@ Please note that this RPM does not create the database or database user; it only
%package selfservice
Summary: Self-service interface for %{name}
Group: Applications/Internet
%package selfservice
Summary: Self-service interface for %{name}
Group: Applications/Internet
-Conflicts: %{name}
Requires: %{name}-selfservice-cgi
%description selfservice
Requires: %{name}-selfservice-cgi
%description selfservice
@@ -111,7+113,6 @@ For security reasons, it is set to conflict with %{name} as you should not insta
%package selfservice-core
Summary: Core Perl libraries for the self-service interface for %{name}
Group: Applications/Internet
%package selfservice-core
Summary: Core Perl libraries for the self-service interface for %{name}
Group: Applications/Internet
-Conflicts: %{name}
%description selfservice-core
This package installs the Perl modules and client daemon for the self-service interface for %{name}. It does not install the CGI interface and can be used with a different front-end.
%description selfservice-core
This package installs the Perl modules and client daemon for the self-service interface for %{name}. It does not install the CGI interface and can be used with a different front-end.
@@ -120,7+121,6 @@ For security reasons, it is set to conflict with %{name} as you should not insta
%package selfservice-cgi
Summary: CGI scripts for the self-service interface for %{name}
Group: Applications/Internet
%package selfservice-cgi
Summary: CGI scripts for the self-service interface for %{name}
Group: Applications/Internet
-Conflicts: %{name}
Requires: %{name}-selfservice-core
Prefix: %{freeside_selfservice_document_root}
Requires: %{name}-selfservice-core
Prefix: %{freeside_selfservice_document_root}
@@ -131,7+131,6 @@ For security reasons, it is set to conflict with %{name} as you should not insta
%package selfservice-php
Summary: Sample PHP files for the self-service interface for %{name}
Group: Applications/Internet
%package selfservice-php
Summary: Sample PHP files for the self-service interface for %{name}
Group: Applications/Internet
-Conflicts: %{name}
Prefix: %{freeside_selfservice_document_root}
%description selfservice-php
Prefix: %{freeside_selfservice_document_root}
%description selfservice-php
@@ -140,7+139,7 @@ For security reasons, it is set to conflict with %{name} as you should not insta
%prep
%setup -q
%prep
%setup -q
-%{__rm} bin/pod2x # Only useful to Ivan Kohler now
+%{__rm} -f bin/pod2x # Only useful to Ivan Kohler now