rpms/cyrus-imapd/devel README.rpm, NONE, 1.1 cyrus-imapd.spec, 1.75, 1.76 cyrus-imapd-README.RPM, 1.4, NONE

Michal Hlavinka mhlavink at fedoraproject.org
Tue Jun 8 11:45:51 UTC 2010 

Author: mhlavink

Update of /cvs/pkgs/rpms/cyrus-imapd/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv13572

Modified Files:
	cyrus-imapd.spec 
Added Files:
	README.rpm 
Removed Files:
	cyrus-imapd-README.RPM 
Log Message:
big spec cleanup - step 2
fix typo, reorder patches and sources



--- NEW FILE README.rpm ---
---------------
Cyrus IMAPd RPM
---------------

This is a _very_ 'quick and dirty' install howto.

The following steps should lead you to a running Cyrus IMAP server:

1)  Install on a distribution which is supported by this RPM. Don't install
    on a dirty system, where you have previously installed from source.
2)  Don't install if you have a previous Cyrus IMAPd installation <=2.1.x on
    your box. Upgrading any Invoca rpm based installation should be fine.
3)  Make sure you understand that this RPM installs in FHS compliant
    directories, like /var/lib/imap and /var/spool/imap
4)  Make sure cyrus-sasl is installed.
5)  Make sure saslauthd is running. If not, edit /etc/sysconfig/saslauthd as
    needed and do 'chkconfig saslauthd on ; service saslauthd start'
6)  Install the cyrus-imapd RPMs.
7)  If it's your first install of Cyrus IMAPd, then set a password for the
    cyrus user in whatever database you are using to authenticate. When
    using a local account, this should be 'passwd cyrus'.
8)  Make sure your MTA delivers to Cyrus IMAPd, I recommend LMTP for this.
9)  Start Cyrus IMAPd with 'service cyrus-imapd start'
10) Run cyradm and create a user. Usually it's something like this:
    'cyradm --user=cyrus --auth=login localhost'
11) If you're using sendmail, be aware that cyrusv2.m4 included in standard
    sendmail distribution uses socket /var/imap/socket/lmtp while this rpm
    uses /var/lib/imap/socket/lmtp.
12) Check your syslog configuration. This RPM uses the mail facility to log
    messages. On busy sites you may want to limit the mail facility to the
    info priority with something like 'mail.info    /var/log/maillog' in
    /etc/syslog.conf.

Enjoy!


Index: cyrus-imapd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cyrus-imapd/devel/cyrus-imapd.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- cyrus-imapd.spec	8 Jun 2010 11:01:40 -0000	1.75
+++ cyrus-imapd.spec	8 Jun 2010 11:45:51 -0000	1.76
@@ -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 mu
 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 {} \;


--- cyrus-imapd-README.RPM DELETED ---

More information about the scm-commits mailing list