[csw-devel] SF.net SVN: gar:[13535] csw/mgar/pkg/apache2/branches/open-bug-squash/ Makefile

[bdwalton at users.sourceforge.net]

Revision: 13535
          http://gar.svn.sourceforge.net/gar/?rev=13535&view=rev
Author:   bdwalton
Date:     2011-03-02 17:28:18 +0000 (Wed, 02 Mar 2011)

Log Message:
-----------
apache2/branches/open-bug-squash: use the new obsoletes mechanism instead of declaring I with apache2c

Modified Paths:
--------------
    csw/mgar/pkg/apache2/branches/open-bug-squash/Makefile

Modified: csw/mgar/pkg/apache2/branches/open-bug-squash/Makefile
===================================================================
--- csw/mgar/pkg/apache2/branches/open-bug-squash/Makefile	2011-03-02 16:41:56 UTC (rev 13534)
+++ csw/mgar/pkg/apache2/branches/open-bug-squash/Makefile	2011-03-02 17:28:18 UTC (rev 13535)
@@ -65,6 +65,8 @@
 ARCHALL_CSWap2prefork = 1
 ARCHALL_CSWapache2rt = 1
 
+OBSOLETES_CSWapache2 = CSWapache2c
+
 CATALOGNAME_CSWapache2 = apache2
 CATALOGNAME_CSWapache2-devel = apache2_devel
 CATALOGNAME_CSWapache2-manual = apache2_manual
@@ -81,8 +83,6 @@
 SPKG_DESC_CSWap2prefork = A stub for the old prefork mpm package.
 SPKG_DESC_CSWapache2rt = A stub for the old apache2rt package.
 
-INCOMPATIBLE_PKGS_CSWapache2  = CSWapache2c
-
 RUNTIME_DEP_PKGS_CSWapache2       += CSWexpat CSWiconv CSWosslutils
 RUNTIME_DEP_PKGS_CSWapache2       += CSWoldaprt CSWosslrt CSWzlib
 RUNTIME_DEP_PKGS_CSWapache2       += CSWapr CSWapr-util CSWbdb48


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.