ZCS-13919:Fix rebase conflicts

Author: umagmrit

zimbra/mta-components/zimbra-mta-components/debian/control

@@ -13,7 +13,7 @@ Depends: ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends},
  zimbra-clamav-db (>= 1.0.0-1zimbra8.7b2ZAPPEND), zimbra-cluebringer (>= 2.1.0.0.cf484f1b93cf9965886cc89d33bdeee9c26426cb-1zimbra8.7b2ZAPPEND), zimbra-mariadb (>= 10.1.25-1zimbra8.7b3ZAPPEND),
  zimbra-opendkim (>= 2.10.3-1zimbra8.7b7ZAPPEND), zimbra-perl-mail-spamassassin (>= 4.0.1-1zimbra8.8b5ZAPPEND),
  zimbra-postfix (>= 3.6.4-1zimbra8.7b5ZAPPEND),
- zimbra-spamassassin-rules (>= 1.0.0-1zimbra8.8b7ZAPPEND)
+ zimbra-spamassassin-rules (>= 1.0.0-1zimbra8.8b8ZAPPEND)
 Description: Zimbra components for MTA package
  Zimbra mta components pulls in all the packages used by
  zimbra-mta

zimbra/mta-components/zimbra-mta-components/rpm/SPECS/mta-components.spec

@@ -9,7 +9,7 @@ Requires:           zimbra-cluebringer >= 2.1.0.0.cf484f1b93cf9965886cc89d33bdee
 Requires:           zimbra-mariadb >= 10.1.25-1zimbra8.7b3ZAPPEND
 Requires:           zimbra-opendkim >= 2.10.3-1zimbra8.7b7ZAPPEND, zimbra-perl-mail-spamassassin >= 4.0.1-1zimbra8.8b5ZAPPEND
 Requires:           zimbra-postfix >= 3.6.14-1zimbra8.7b5ZAPPEND
-Requires:           zimbra-spamassassin-rules >= 1.0.0-1zimbra8.8b7ZAPPEND
+Requires:           zimbra-spamassassin-rules >= 1.0.0-1zimbra8.8b8ZAPPEND
 Packager:           Zimbra Packaging Services <packaging-devel@zimbra.com>
 Group:              Development/Languages
 AutoReqProv:        no