Description of problem:

5.8 Solaris and monitoring removal is not complete

Version-Release number of selected component (if applicable):
satellite-schema-5.8.0.12-1.el6sat.noarch
spacewalk-schema-2.5.1-18.el6sat.noarch

How reproducible:
always

Steps to Reproduce:
1. rhn-config-schema.pl --source=/etc/sysconfig/rhn/postgres/main.sql --target=deploy.sql --tablespace-name=data_tbs

Actual results:
deploy.sql still contains monitoring and solaris related entries


Details:
> Monitoring:
insert into rhnOrgEntitlementType (id, label, name)
        values (sequence_nextval('rhn_org_entitlement_type_seq'),
                'rhn_monitor','Red Hat Network Monitoring'
        );

insert into rhnServerGroupType (id, label, name, permanent, is_base)
        values (sequence_nextval('rhn_servergroup_type_seq'),
                'monitoring_entitled', 'RHN Monitoring Entitled Servers',
        'N', 'N'
        );

insert into rhn_config_parameter(group_name,name,value,security_type,last_update_user,last_update_date) values ( 'notification', 'fromname', 'Monitoring Satellite Notification', 'INTERNAL', 'system',current_timestamp);

-- many entries like:
insert into rhnServerServerGroupArchCompat ( server_arch_id, server_group_type )
        values (lookup_server_arch('i386-redhat-linux'),
            lookup_sg_type('monitoring_entitled'));


> Solaris:
-- there are more entries in each table:
insert into rhnArchType (id, label, name) values
        (sequence_nextval('rhn_archtype_id_seq'), 'sysv-solaris', 'SysV-Solaris');

insert into rhnChannelArch (id, label, name, arch_type_id) values
(sequence_nextval('rhn_channel_arch_id_seq'), 'channel-sparc-sun-solaris', 'Sparc Solaris', lookup_arch_type('sysv-solaris'));

insert into rhnServerArch (id, label, name, arch_type_id) values
(sequence_nextval('rhn_server_arch_id_seq'), 'sparc-sun4m-solaris', 'Sparc Solaris', lookup_arch_type('sysv-solaris'));

insert into rhnPackageArch (id, label, name, arch_type_id) values
(sequence_nextval('rhn_package_arch_id_seq'), 'sparc-solaris', 'Sparc Solaris', lookup_arch_type('sysv-solaris'));

INSERT
  INTO rhnArchTypeActions (arch_type_id, action_style, action_type_id)
       (SELECT ArchT.id, 'install', ActionT.id
          FROM rhnArchType ArchT, rhnActionType ActionT
         WHERE ArchT.label = 'sysv-solaris'
           AND ActionT.label = 'solarispkgs.install');

insert into rhnActionType values (24, 'solarispkgs.install', 'Solaris Package Install', 'Y', 'Y');

insert into rhnChannelPackageArchCompat (channel_arch_id, package_arch_id)
values (LOOKUP_CHANNEL_ARCH('channel-sparc-sun-solaris'), LOOKUP_PACKAGE_ARCH('sparc-solaris'));

insert into rhnChildChannelArchCompat (parent_arch_id, child_arch_id)
values (LOOKUP_CHANNEL_ARCH('channel-sparc'), LOOKUP_CHANNEL_ARCH('channel-sparc-sun-solaris'));

insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('sparc-solaris'), LOOKUP_PACKAGE_ARCH('noarch-solaris'), current_timestamp, current_timestamp);

insert into rhnServerChannelArchCompat (server_arch_id, channel_arch_id) values
(LOOKUP_SERVER_ARCH('sparc-sun4m-solaris'), LOOKUP_CHANNEL_ARCH('channel-sparc-sun-solaris'));

insert into rhnServerPackageArchCompat
(server_arch_id, package_arch_id, preference) values
(LOOKUP_SERVER_ARCH('sparc-sun4m-solaris'), LOOKUP_PACKAGE_ARCH('sparc.sun4u-solaris'), 10);

insert into rhnServerServerGroupArchCompat ( server_arch_id, server_group_type )
   values (lookup_server_arch('sparc-sun4m-solaris'),
           lookup_sg_type('enterprise_entitled'));