[freeside-commits] freeside/install/rpm freeside.spec, 1.1.4.28, 1.1.4.29

[Richard Siddall]

Update of /home/cvs/cvsroot/freeside/install/rpm
In directory wavetail.420.am:/tmp/cvs-serv30624/install/rpm

Modified Files:
      Tag: FREESIDE_1_7_BRANCH
	freeside.spec 
Log Message:
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.


Index: freeside.spec
===================================================================
RCS file: /home/cvs/cvsroot/freeside/install/rpm/Attic/freeside.spec,v
retrieving revision 1.1.4.28
retrieving revision 1.1.4.29
diff -u -d -r1.1.4.28 -r1.1.4.29
--- freeside.spec	26 Dec 2008 16:59:59 -0000	1.1.4.28
+++ freeside.spec	28 Jan 2009 16:28:59 -0000	1.1.4.29
@@ -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 @@
 Requires: mod_ssl
 %endif
 Requires: perl-Apache-DBI
-Conflicts: %{name}-apacheasp
 Provides: %{name}-frontend = %{version}
 BuildArch: noarch
 
@@ -101,9 +100,6 @@
 %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 @@
 %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 @@
 %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 @@
 %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