Fix perl shebangs and an extra provided symbol.

For some reason, perl(AnnotateInlinedCIDs) was provided, so filter it
out.
Also move the legacy deliver symlink to the base package to follow the
deliver binary.

cyrus-imapd.spec

@@ -21,6 +21,8 @@ Release: 5%{?dist}
 %define cyrusgroup mail
 %define cyrexecdir %_libexecdir/%name
 
+%global __provides_exclude ^perl\\(AnnotateInlinedCIDs\\)$
+
 Summary: A high-performance email, contacts and calendar server
 License: BSD
 URL: http://www.cyrusimap.org/
@@ -249,6 +251,16 @@ sed -i \
 
 popd
 
+# These two files have a bizarre perl-in-shell shebang setip
+sed -i -e '1i#!/usr/bin/perl' -e '1,3d' perl/imap/cyradm.sh perl/sieve/scripts/sieveshell.pl
+
+# The pm files have shebang lines for some reason
+sed -i -e '1{/usr.bin.perl/d}' perl/annotator/{Message,Daemon}.pm
+
+# This one uses env
+sed -i -e '1i#!/usr/bin/perl' -e '1d' tools/rehash
+
+
 %build
 # This is the test suite, which doesn't build much but does verify its dependencies.
 # If this is done after the configure call, the one thing it does build fails
@@ -447,9 +459,6 @@ rm %buildroot/%cyrexecdir/pop3proxyd
 find %buildroot -name "perllocal.pod" -exec rm {} \;
 find %buildroot -name ".packlist" -exec rm {} \;
 
-# The pm files have shebang lines for some reason
-sed -i -e '1{/usr.bin.perl/d}' %buildroot/%perl_vendorlib/Cyrus/Annotator/{Message,Daemon}.pm
-
 # And this one gets installed with executable permission
 chmod -x %buildroot/%perl_vendorlib/Cyrus/Annotator/Daemon.pm
 
@@ -570,6 +579,11 @@ getent passwd cyrus >/dev/null || /usr/sbin/useradd -c "Cyrus IMAP Server" -d /v
 %exclude %_sbindir/cyr_virusscan
 %exclude %_mandir/man8/cyr_virusscan.8*
 
+# For the legacy symlink to the deliver binary
+# RF hardcoded-library-path in /usr/lib/cyrus-imapd
+/usr/lib/cyrus-imapd/
+
+
 %dir /etc/pki/cyrus-imapd
 %attr(0640,root,%cyrusgroup) %ghost %config(missingok,noreplace) %verify(not md5 size mtime) %ssl_pem_file
 
@@ -635,8 +649,6 @@ getent passwd cyrus >/dev/null || /usr/sbin/useradd -c "Cyrus IMAP Server" -d /v
 %files utils
 %{_bindir}/*
 %_mandir/man1/*
-# RF hardcoded-library-path in /usr/lib/cyrus-imapd
-/usr/lib/cyrus-imapd
 
 
 %files virusscan
@@ -668,6 +680,8 @@ getent passwd cyrus >/dev/null || /usr/sbin/useradd -c "Cyrus IMAP Server" -d /v
 - Split Perl module into a separate perl-Cyrus package.
 - Move utilities in /usr/sbin from -utils package to main package.  This
   matches the way we packaged the 2.4 versions.
+- Fix some odd Perl shebangs and an erroneous provided symbol.
+- Moved deliver symlink to the main package as well.
 
 * Thu Jun 07 2018 Jason L Tibbitts III <tibbs@math.uh.edu> - 3.0.7-4
 - Update Cassandane checkout.  Drop upstreamed patch.