From: rsiddall <rsiddall>
Date: Wed, 28 Jan 2009 16:28:59 +0000 (+0000)
Subject: Removed conflict between core billing package and self-service RPMs so you can
X-Git-Tag: freeside_1_7_4rc1~116
X-Git-Url: http://git.freeside.biz/gitweb/?a=commitdiff_plain;h=3388bd164fb6eed4229bdbf3618ce2ced746ac95;p=freeside.git

Removed conflict between core billing package and self-service RPMs so you can
install them all on the same machine.  This may have applications if you're using
XMLRPC to talk to the self-service interface from PHP, Python, etc.
---

diff --git a/install/rpm/freeside.spec b/install/rpm/freeside.spec
index 0a248495c..601dfc83d 100644
--- a/install/rpm/freeside.spec
+++ b/install/rpm/freeside.spec
@@ -1,6 +1,6 @@
 %{!?_initrddir:%define _initrddir /etc/rc.d/init.d}
 %{!?version:%define version 1.7.3}
-%{!?release:%define release 5}
+%{!?release:%define release 6}
 
 Summary: Freeside ISP Billing System
 Name: freeside
@@ -62,7 +62,6 @@ Prefix: %{freeside_document_root}
 Requires: mod_ssl
 %endif
 Requires: perl-Apache-DBI
-Conflicts: %{name}-apacheasp
 Provides: %{name}-frontend = %{version}
 BuildArch: noarch
 
@@ -101,9 +100,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
-%if "%{_vendor}" != "suse"
-Conflicts: %{name}
-%endif
 Requires: %{name}-selfservice-cgi
 
 %description selfservice
@@ -113,9 +109,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
-%if "%{_vendor}" != "suse"
-Conflicts: %{name}
-%endif
 
 %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.
@@ -124,9 +117,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
-%if "%{_vendor}" != "suse"
-Conflicts: %{name}
-%endif
 Requires: %{name}-selfservice-core
 Prefix: %{freeside_selfservice_document_root}
 
@@ -137,9 +127,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
-%if "%{_vendor}" != "suse"
-Conflicts: %{name}
-%endif
 Prefix: %{freeside_selfservice_document_root}
 
 %description selfservice-php