rpms/cyrus-imapd
5
0
Fork 0
Code Issues Pull Requests Releases Activity

More cleanups.

Browse Source 
Additional four-space indentation.
Missed an instance of %{__perl}.
This commit is contained in:
Jason Tibbitts 2016-11-22 17:59:47 -06:00
parent 1e1862cca0
commit 779e0eeecc
1 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
cyrus-imapd.spec
View File

@ -38,8 +38,11 @@ Source13: cyr_systemd_helper
#Patch4: cyrus-imapd-2.3.18-potential-overflow.patch
BuildRequires: autoconf automake bison flex groff libtool pkgconfig transfig
BuildRequires: perl-devel perl-generators perl(Pod::Html) tcp_wrappers
BuildRequires: autoconf automake bison flex groff libtool
BuildRequires: pkgconfig tcp_wrappers transfig
BuildRequires: perl-devel perl-generators perl(ExtUtils::MakeMaker) perl(Pod::Html)
BuildRequires: cyrus-sasl-devel jansson-devel krb5-devel
BuildRequires: libical-devel libxml2-devel net-snmp-devel openldap-devel
BuildRequires: openssl-devel sqlite-devel
@ -109,7 +112,7 @@ 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' \
man/master.8 doc/man.html
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}@"
@ -164,10 +167,10 @@ autoreconf -vi
%install
# This is needed to install the perl files correctly
pushd perl/imap
perl Makefile.PL PREFIX=%{buildroot}%{_prefix} INSTALLDIRS=vendor
perl Makefile.PL PREFIX=%{buildroot}%{_prefix} INSTALLDIRS=vendor
popd
pushd perl/sieve/managesieve
perl Makefile.PL PREFIX=%{buildroot}%{_prefix} INSTALLDIRS=vendor
perl Makefile.PL PREFIX=%{buildroot}%{_prefix} INSTALLDIRS=vendor
popd
# Do what the regular make install does
@ -180,19 +183,19 @@ install -m 755 perl/imap/cyradm %{buildroot}%{_bindir}/
# Install tools
for tool in tools/* ; do
test -f ${tool} && install -m 755 ${tool} %{buildroot}%{cyrexecdir}/
test -f ${tool} && install -m 755 ${tool} %{buildroot}%{cyrexecdir}/
done
# Create directories
install -d \
%{buildroot}/etc/{rc.d/init.d,logrotate.d,pam.d,sysconfig,cron.daily} \
%{buildroot}%{_libdir}/sasl \
%{buildroot}%{_var}/spool/imap \
%{buildroot}%{_var}/lib/imap/{user,quota,proc,log,msg,socket,db,sieve,sync,md5,rpm,backup,meta} \
%{buildroot}%{_var}/lib/imap/ptclient \
%{buildroot}%{_datadir}/%{name}/rpm \
%{buildroot}/etc/pki/%{name} \
doc/contrib
%{buildroot}/etc/{rc.d/init.d,logrotate.d,pam.d,sysconfig,cron.daily} \
%{buildroot}%{_libdir}/sasl \
%{buildroot}%{_var}/spool/imap \
%{buildroot}%{_var}/lib/imap/{user,quota,proc,log,msg,socket,db,sieve,sync,md5,rpm,backup,meta} \
%{buildroot}%{_var}/lib/imap/ptclient \
%{buildroot}%{_datadir}/%{name}/rpm \
%{buildroot}/etc/pki/%{name} \
doc/contrib
# Install additional files
install -m 755 %{SOURCE8} %{buildroot}%{cyrexecdir}/cvt_cyrusdb_all
@ -247,8 +250,8 @@ mv -f %{buildroot}%{_mandir}/man8/master.8 %{buildroot}%{_mandir}/man8/cyru
# Rename 'fetchnews' binary and manpage to avoid clash with leafnode
mv -f %{buildroot}%{cyrexecdir}/fetchnews %{buildroot}%{cyrexecdir}/cyrfetchnews
mv -f %{buildroot}%{_mandir}/man8/fetchnews.8 %{buildroot}%{_mandir}/man8/cyrfetchnews.8
%{__perl} -pi -e 's|fetchnews|cyrfetchnews|g;s|Fetchnews|Cyrfetchnews|g;s/FETCHNEWS/CYRFETCHNEWS/g' \
%{buildroot}%{_mandir}/man8/cyrfetchnews.8
perl -pi -e 's|fetchnews|cyrfetchnews|g;s|Fetchnews|Cyrfetchnews|g;s/FETCHNEWS/CYRFETCHNEWS/g' \
%{buildroot}%{_mandir}/man8/cyrfetchnews.8
#remove executable bit from docs
for ddir in doc perl/imap/examples