From 0cfd68e75c6f8947b65304b6f7560da4c8f64470 Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Wed, 13 Jun 2018 17:21:21 -0500 Subject: [PATCH] Move utilities in sbin from -utils to the main package. --- cyrus-imapd.spec | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/cyrus-imapd.spec b/cyrus-imapd.spec index b851555..58c7081 100644 --- a/cyrus-imapd.spec +++ b/cyrus-imapd.spec @@ -563,15 +563,16 @@ getent passwd cyrus >/dev/null || /usr/sbin/useradd -c "Cyrus IMAP Server" -d /v %files %doc README.md doc/README.* doc/examples doc/text +%_sbindir/* %_datadir/cyrus-imapd %_mandir/man5/* %_mandir/man8/* +%exclude %_sbindir/cyr_virusscan %exclude %_mandir/man8/cyr_virusscan.8* %dir /etc/pki/cyrus-imapd %attr(0640,root,%cyrusgroup) %ghost %config(missingok,noreplace) %verify(not md5 size mtime) %ssl_pem_file - %config(noreplace) /etc/cyrus.conf %config(noreplace) /etc/imapd.conf %config(noreplace) /etc/logrotate.d/cyrus-imapd @@ -633,9 +634,7 @@ getent passwd cyrus >/dev/null || /usr/sbin/useradd -c "Cyrus IMAP Server" -d /v %files utils %{_bindir}/* -%{_sbindir}/* -%exclude %_sbindir/cyr_virusscan -%{_mandir}/man1/* +%_mandir/man1/* # RF hardcoded-library-path in /usr/lib/cyrus-imapd /usr/lib/cyrus-imapd @@ -667,6 +666,8 @@ getent passwd cyrus >/dev/null || /usr/sbin/useradd -c "Cyrus IMAP Server" -d /v - Split libraries into a -libs subpackage. - Fix rpath issues in libraries. - 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. * Thu Jun 07 2018 Jason L Tibbitts III - 3.0.7-4 - Update Cassandane checkout. Drop upstreamed patch.