From 04c5de2868d9644c408527a3cc0bc960a68c6384 Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Wed, 23 Nov 2016 18:56:25 -0600 Subject: [PATCH] Switch some pointless perl calls to sed. --- cyrus-imapd.spec | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/cyrus-imapd.spec b/cyrus-imapd.spec index 619b150..1eeb022 100644 --- a/cyrus-imapd.spec +++ b/cyrus-imapd.spec @@ -105,19 +105,19 @@ one running the server. %autosetup -p1 install -m 644 %SOURCE11 doc/ -# Modify docs master --> cyrus-master -perl -pi -e "s@master\(8\)@cyrus-master(8)@" man/*5 man/*8 lib/imapoptions -sed -i -e 's|\([^-]\)master|\1cyrus-master|g;s|^master|cyrus-master|g;s|Master|Cyrus-master|g;s|MASTER|CYRUS-MASTER|g' \ +# Modify the documentation to change master --> cyrus-master +sed -i -e "s/master(8)/cyrus-master(8)/" man/*5 man/*8 lib/imapoptions +sed -i -e 's|\([^-]\)master|\1cyrus-master|g' \ + -e 's|^master|cyrus-master|g' \ + -e 's|Master|Cyrus-master|g' \ + -e 's|MASTER|CYRUS-MASTER|g' \ man/master.8 doc/man.html -# Modify path in perl scripts -find . -type f -name "*.pl" | xargs perl -pi -e "s@/usr/local/bin/perl@%{__perl}@" - # modify lmtp socket path in .conf files -perl -pi -e "s@/var/imap/@/var/lib/imap/@" master/conf/*.conf doc/cyrusv2.mc +sed -i -e "s@/var/imap/@/var/lib/imap/@" master/conf/*.conf doc/cyrusv2.mc # enable idled in .conf files to prevent error messages -#perl -pi -e "s/# idled/ idled/" master/conf/*.conf +sed -i -e "s/# idled/ idled/" master/conf/*.conf # Fix permissions on perl programs find . -type f -name "*.pl" -exec chmod 755 {} \; @@ -327,8 +327,8 @@ fi %config(noreplace) /etc/cyrus.conf %config(noreplace) /etc/imapd.conf -%config(noreplace) /etc/logrotate.d/%{name} -%config(noreplace) /etc/sysconfig/%{name} +%config(noreplace) /etc/logrotate.d/cyrus-imapd +%config(noreplace) /etc/sysconfig/cyrus-imapd %config(noreplace) /etc/pam.d/pop %config(noreplace) /etc/pam.d/imap %config(noreplace) /etc/pam.d/sieve