From 373f513e1d1b534c3eea28ce52ef5fd055ddbe1c Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Tue, 20 Jun 2017 19:00:23 -0500 Subject: [PATCH] Add the old /usr/lib/cyrus-imapd directory To help with the transition to the new version, add back in the old /usrlib/cyrus-imapd directory and symlink the deliver program there. --- cyrus-imapd.spec | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/cyrus-imapd.spec b/cyrus-imapd.spec index f71d5a5..7909032 100644 --- a/cyrus-imapd.spec +++ b/cyrus-imapd.spec @@ -9,7 +9,7 @@ Name: cyrus-imapd Version: 3.0.1 -Release: 6%{?dist} +Release: 7%{?dist} %define ssl_pem_file /etc/pki/%name/%name.pem @@ -307,8 +307,6 @@ make -C tools/vzic %install make install DESTDIR=%buildroot -# Install some additional binaries - # Create directories install -d \ %buildroot/etc/{rc.d/init.d,logrotate.d,pam.d,sysconfig,cron.daily} \ @@ -320,7 +318,6 @@ install -d \ %buildroot/%cyrexecdir \ %buildroot/etc/pki/%name - # Some tools which aren't installed by the makefile which we want install -m 755 notifyd/notifytest %buildroot%_bindir/ install -m 755 perl/imap/cyradm %buildroot%_bindir/ @@ -412,6 +409,13 @@ mv %buildroot/%_mandir/man8/master.8 %buildroot/%_mandir/man8/master.8cyrus # Rename 'httpd' manpage to avoid clash with Apache mv %buildroot/%_mandir/man8/httpd.8 %buildroot/%_mandir/man8/cyr_httpd.8 +# Old cyrus packages used to keep some executables in /usr/lib/cyrus-imapd +# RF hardcoded-library-path in %%buildroot/usr/lib/cyrus-imapd +mkdir %buildroot/usr/lib/cyrus-imapd +pushd %buildroot/usr/lib/cyrus-imapd +ln -s ../../sbin/deliver +popd + #remove executable bit from docs for ddir in doc perl/imap/examples do @@ -667,6 +671,8 @@ getent passwd cyrus >/dev/null || /usr/sbin/useradd -c "Cyrus IMAP Server" -d /v %{perl_vendorlib}/Cyrus %{_mandir}/man3/*.3pm* %{_mandir}/man1/* +# RF hardcoded-library-path in /usr/lib/cyrus-imapd +/usr/lib/cyrus-imapd %files vzic @@ -674,6 +680,10 @@ getent passwd cyrus >/dev/null || /usr/sbin/useradd -c "Cyrus IMAP Server" -d /v %changelog +* Tue Jun 20 2017 Jason L Tibbitts III - 3.0.1-7 +- Add old /usr/lib/cyrus-imapd directory to the utils package and add a symlink + there to the deliver binary. This should help a bit with migrations. + * Thu Jun 15 2017 Jason L Tibbitts III - 3.0.1-6 - Rename two commands: quota -> cyr_quota, restore -> cyr_restore. - Fix Cassandane to handle those renames.