big spec cleanup - step 2 fix typo, reorder patches and sources
This commit is contained in:
Michal Hlavinka
parent
9d65fa65ac
commit
11263a4916
@ -4,7 +4,7 @@ Release: 5%{?dist}
|
||||
|
||||
%define ssl_pem_file %{_sysconfdir}/pki/%{name}/%{name}.pem
|
||||
|
||||
#uid/gid reserved, see setup:/usr/share/doc/setup*/uidgid
|
||||
# uid/gid reserved, see setup:/usr/share/doc/setup*/uidgid
|
||||
%define uid 76
|
||||
%define gid 76
|
||||
|
||||
@ -17,35 +17,42 @@ License: BSD
|
||||
Group: System Environment/Daemons
|
||||
URL: http://cyrusimap.web.cmu.edu/
|
||||
Source0: ftp://ftp.andrew.cmu.edu/pub/cyrus/%{name}-%{version}.tar.gz
|
||||
Source5: cyrus-imapd.logrotate
|
||||
Source6: cyrus-imapd.imap-2.3.x-conf
|
||||
Source7: cyrus-imapd.pam-config
|
||||
Source8: http://email.uoa.gr/projects/cyrus/autocreate/README.autocreate-cyrus-2.3
|
||||
Source9: http://email.uoa.gr/projects/cyrus/autosievefolder/README.autosievefolder
|
||||
Source11: cyrus-imapd.init
|
||||
Source12: cyrus-imapd.sysconfig
|
||||
Source13: cyrus-imapd.cvt_cyrusdb_all
|
||||
Source14: cyrus-imapd.magic
|
||||
Source25: cyrus-imapd.cron-daily
|
||||
Source1: cyrus-imapd.logrotate
|
||||
Source2: cyrus-imapd.imap-2.3.x-conf
|
||||
Source3: cyrus-imapd.pam-config
|
||||
Source4: http://email.uoa.gr/projects/cyrus/autocreate/README.autocreate-cyrus-2.3
|
||||
Source5: http://email.uoa.gr/projects/cyrus/autosievefolder/README.autosievefolder
|
||||
Source6: cyrus-imapd.init
|
||||
Source7: cyrus-imapd.sysconfig
|
||||
Source8: cyrus-imapd.cvt_cyrusdb_all
|
||||
Source9: cyrus-imapd.magic
|
||||
Source10: cyrus-imapd.cron-daily
|
||||
Source11: README.rpm
|
||||
|
||||
# inclusion requested:
|
||||
# https://bugzilla.andrew.cmu.edu/show_bug.cgi?id=3182
|
||||
# https://bugzilla.andrew.cmu.edu/show_bug.cgi?id=3212
|
||||
Patch1: http://email.uoa.gr/download/cyrus/cyrus-imapd-2.3.16/cyrus-imapd-2.3.16-autocreate-0.10-0.diff
|
||||
|
||||
# inclusion requested:
|
||||
# https://bugzilla.andrew.cmu.edu/show_bug.cgi?id=3212
|
||||
Patch2: http://email.uoa.gr/download/cyrus/cyrus-imapd-2.3.16/cyrus-imapd-2.3.16-autosieve-0.6.0.diff
|
||||
|
||||
Patch4: http://www.oakton.edu/~jwade/cyrus/cyrus-imapd-2.1.3/cyrus-imapd-2.1.3-flock.patch
|
||||
Patch3: http://www.oakton.edu/~jwade/cyrus/cyrus-imapd-2.1.3/cyrus-imapd-2.1.3-flock.patch
|
||||
|
||||
Patch14: cyrus-imapd-2.3.1-authid_normalize.patch
|
||||
Patch4: cyrus-imapd-2.3.1-authid_normalize.patch
|
||||
|
||||
Patch15: cyrus-imapd-2.3.1-make_md5_defaults.patch
|
||||
# fedora/rhel specific, we use different directory
|
||||
Patch5: cyrus-imapd-2.3.1-make_md5_defaults.patch
|
||||
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=461875
|
||||
Patch19: cyrus-imapd-2.3.12p2-current-db.patch
|
||||
# fedora/rhel specific, find current db lib, rhbz#461875
|
||||
Patch6: cyrus-imapd-2.3.12p2-current-db.patch
|
||||
|
||||
# workaround, rhbz#553011
|
||||
Patch20: cyrus-imapd-2.3.16-nodenny.patch
|
||||
# temporary workaround, rhbz#553011, https://bugzilla.andrew.cmu.edu/show_bug.cgi?id=3206
|
||||
Patch7: cyrus-imapd-2.3.16-nodenny.patch
|
||||
|
||||
# from upstream, rhbz#576652, for cyrus-imapd < 2.4
|
||||
Patch21: cyrus-imapd-2.3.15-qos.patch
|
||||
Patch8: cyrus-imapd-2.3.15-qos.patch
|
||||
|
||||
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
|
||||
|
||||
@ -77,7 +84,7 @@ board environment to be set up across multiple servers. It differs from
|
||||
other IMAP server implementations in that it is run on "sealed"
|
||||
servers, where users are not normally permitted to log in and have no
|
||||
system account on the server. The mailbox database is stored in parts
|
||||
of the filesystem that are private to the Cyrus IMAP server. All user
|
||||
of the file system that are private to the Cyrus IMAP server. All user
|
||||
access to mail is through software using the IMAP, POP3 or KPOP
|
||||
protocols. It also includes support for virtual domains, NNTP,
|
||||
mailbox annotations, and much more. The private mailbox database design
|
||||
@ -119,12 +126,14 @@ one running the server.
|
||||
%setup -q
|
||||
%patch1 -p1 -b .autocreate
|
||||
%patch2 -p1 -b .autosieve
|
||||
%patch4 -p1 -b .flock
|
||||
%patch14 -p1 -b .authid_normalize
|
||||
%patch15 -p1 -b .make_md5_defaults
|
||||
%patch19 -p1 -b .db4.7
|
||||
%patch20 -p1 -b .nodenny
|
||||
%patch21 -p1 -b .qos
|
||||
%patch3 -p1 -b .flock
|
||||
%patch4 -p1 -b .authid_normalize
|
||||
%patch5 -p1 -b .make_md5_defaults
|
||||
%patch6 -p1 -b .db4.7
|
||||
%patch7 -p1 -b .nodenny
|
||||
%patch8 -p1 -b .qos
|
||||
|
||||
install -m 644 %{SOURCE4} %{SOURCE5} %{SOURCE11} doc/
|
||||
|
||||
# only to update config.* files
|
||||
automake -a -f -c || :
|
||||
@ -141,7 +150,7 @@ autoconf -f
|
||||
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 #doc/m4/%{name}-sendmail-8.12.9-cyrusv2.m4
|
||||
%{__perl} -pi -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
|
||||
@ -216,21 +225,21 @@ done
|
||||
doc/contrib
|
||||
|
||||
# Install additional files
|
||||
%{__install} -m 755 %{SOURCE13} %{buildroot}%{_cyrexecdir}/cvt_cyrusdb_all
|
||||
%{__install} -m 644 %{SOURCE14} %{buildroot}%{_datadir}/%{name}/rpm/magic
|
||||
%{__install} -m 755 %{SOURCE8} %{buildroot}%{_cyrexecdir}/cvt_cyrusdb_all
|
||||
%{__install} -m 644 %{SOURCE9} %{buildroot}%{_datadir}/%{name}/rpm/magic
|
||||
%{__install} -p -m 644 master/conf/prefork.conf %{buildroot}%{_sysconfdir}/cyrus.conf
|
||||
%{__install} -p -m 644 %{SOURCE6} %{buildroot}%{_sysconfdir}/imapd.conf
|
||||
%{__install} -p -m 644 %{SOURCE7} %{buildroot}%{_sysconfdir}/pam.d/pop
|
||||
%{__install} -p -m 644 %{SOURCE7} %{buildroot}%{_sysconfdir}/pam.d/imap
|
||||
%{__install} -p -m 644 %{SOURCE7} %{buildroot}%{_sysconfdir}/pam.d/sieve
|
||||
%{__install} -p -m 644 %{SOURCE7} %{buildroot}%{_sysconfdir}/pam.d/mupdate
|
||||
%{__install} -p -m 644 %{SOURCE7} %{buildroot}%{_sysconfdir}/pam.d/lmtp
|
||||
%{__install} -p -m 644 %{SOURCE7} %{buildroot}%{_sysconfdir}/pam.d/nntp
|
||||
%{__install} -p -m 644 %{SOURCE7} %{buildroot}%{_sysconfdir}/pam.d/csync
|
||||
%{__install} -p -m 644 %{SOURCE5} %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
|
||||
%{__install} -p -m 755 %{SOURCE11} %{buildroot}%{_sysconfdir}/rc.d/init.d/%{name}
|
||||
%{__install} -p -m 644 %{SOURCE12} %{buildroot}%{_sysconfdir}/sysconfig/%{name}
|
||||
%{__install} -p -m 755 %{SOURCE25} %{buildroot}%{_sysconfdir}/cron.daily/%{name}
|
||||
%{__install} -p -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/imapd.conf
|
||||
%{__install} -p -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/pam.d/pop
|
||||
%{__install} -p -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/pam.d/imap
|
||||
%{__install} -p -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/pam.d/sieve
|
||||
%{__install} -p -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/pam.d/mupdate
|
||||
%{__install} -p -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/pam.d/lmtp
|
||||
%{__install} -p -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/pam.d/nntp
|
||||
%{__install} -p -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/pam.d/csync
|
||||
%{__install} -p -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
|
||||
%{__install} -p -m 755 %{SOURCE6} %{buildroot}%{_sysconfdir}/rc.d/init.d/%{name}
|
||||
%{__install} -p -m 644 %{SOURCE7} %{buildroot}%{_sysconfdir}/sysconfig/%{name}
|
||||
%{__install} -p -m 755 %{SOURCE10} %{buildroot}%{_sysconfdir}/cron.daily/%{name}
|
||||
|
||||
# Cleanup of doc dir
|
||||
find doc perl -name CVS -type d -prune -exec echo %{__rm} -rf {} \;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user