rpms/dovecot/devel .cvsignore, 1.51, 1.52 dovecot-1.1-default-settings.patch, 1.5, 1.6 dovecot.spec, 1.124, 1.125 sources, 1.54, 1.55 dovecot-1.2-ldap.patch, 1.1, NONE

[Michal Hlavinka]

Author: mhlavink

Update of /cvs/extras/rpms/dovecot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6544

Modified Files:
	.cvsignore dovecot-1.1-default-settings.patch dovecot.spec 
	sources 
Removed Files:
	dovecot-1.2-ldap.patch 
Log Message:
update to 1.2.rc2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dovecot/devel/.cvsignore,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- .cvsignore	30 Mar 2009 14:43:55 -0000	1.51
+++ .cvsignore	6 Apr 2009 08:55:27 -0000	1.52
@@ -1,4 +1,4 @@
 dovecot-1.2-managesieve-0.11.3.tar.gz
-dovecot-1.2.beta4.tar.gz
-dovecot-1.2.beta4-managesieve-0.11.3.diff.gz
+dovecot-1.2.rc2.tar.gz
+dovecot-1.2.rc2-managesieve-0.11.3.diff.gz
 dovecot-sieve-1.1.6.tar.gz

dovecot-1.1-default-settings.patch:

Index: dovecot-1.1-default-settings.patch
===================================================================
RCS file: /cvs/extras/rpms/dovecot/devel/dovecot-1.1-default-settings.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- dovecot-1.1-default-settings.patch	30 Mar 2009 14:35:23 -0000	1.5
+++ dovecot-1.1-default-settings.patch	6 Apr 2009 08:55:28 -0000	1.6
@@ -1,6 +1,6 @@
-diff -up dovecot-1.2.beta4/dovecot-example.conf.default-settings dovecot-1.2.beta4/dovecot-example.conf
---- dovecot-1.2.beta4/dovecot-example.conf.default-settings	2009-03-30 15:56:26.941208108 +0200
-+++ dovecot-1.2.beta4/dovecot-example.conf	2009-03-30 15:56:26.969311839 +0200
+diff -up dovecot-1.2.rc2/dovecot-example.conf.default-settings dovecot-1.2.rc2/dovecot-example.conf
+--- dovecot-1.2.rc2/dovecot-example.conf.default-settings	2009-04-06 10:45:53.519651253 +0200
++++ dovecot-1.2.rc2/dovecot-example.conf	2009-04-06 10:45:53.525647967 +0200
 @@ -10,17 +10,14 @@
  # value inside quotes, eg.: key = "# char and trailing whitespace  "
  
@@ -48,7 +48,7 @@
  
  # If key file is password protected, give the password here. Alternatively
  # give it when starting dovecot with -p parameter. Since this file is often
-@@ -481,7 +478,7 @@
+@@ -485,7 +482,7 @@
  # locking methods as well. Some operating systems don't allow using some of
  # them simultaneously.
  #mbox_read_locks = fcntl
@@ -57,9 +57,9 @@
  
  # Maximum time in seconds to wait for lock (all of them) before aborting.
  #mbox_lock_timeout = 300
-diff -up dovecot-1.2.beta4/src/master/master-settings.c.default-settings dovecot-1.2.beta4/src/master/master-settings.c
---- dovecot-1.2.beta4/src/master/master-settings.c.default-settings	2009-03-30 15:56:26.966311559 +0200
-+++ dovecot-1.2.beta4/src/master/master-settings.c	2009-03-30 15:57:10.994066535 +0200
+diff -up dovecot-1.2.rc2/src/master/master-settings.c.default-settings dovecot-1.2.rc2/src/master/master-settings.c
+--- dovecot-1.2.rc2/src/master/master-settings.c.default-settings	2009-04-06 10:45:53.523648309 +0200
++++ dovecot-1.2.rc2/src/master/master-settings.c	2009-04-06 10:48:05.630586332 +0200
 @@ -178,8 +178,8 @@ struct settings default_settings = {
  	MEMBER(syslog_facility) "mail",
  
@@ -80,9 +80,9 @@
  	MEMBER(verbose_ssl) FALSE,
  	MEMBER(shutdown_clients) TRUE,
  	MEMBER(nfs_check) TRUE,
-@@ -254,7 +254,7 @@ struct settings default_settings = {
- 	MEMBER(maildir_copy_with_hardlinks) TRUE,
+@@ -255,7 +255,7 @@ struct settings default_settings = {
  	MEMBER(maildir_copy_preserve_filename) FALSE,
+ 	MEMBER(maildir_very_dirty_syncs) FALSE,
  	MEMBER(mbox_read_locks) "fcntl",
 -	MEMBER(mbox_write_locks) "dotlock fcntl",
 +	MEMBER(mbox_write_locks) "fcntl",


Index: dovecot.spec
===================================================================
RCS file: /cvs/extras/rpms/dovecot/devel/dovecot.spec,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- dovecot.spec	30 Mar 2009 14:43:55 -0000	1.124
+++ dovecot.spec	6 Apr 2009 08:55:28 -0000	1.125
@@ -2,8 +2,8 @@
 Name: dovecot
 Epoch: 1
 Version: 1.2
-%define betaver beta4
-Release: 0.%{betaver}.2%{?dist}
+%define betaver rc2
+Release: 0.%{betaver}.1%{?dist}
 License: MIT and LGPLv2 and BSD with advertising
 Group: System Environment/Daemons
 
@@ -33,16 +33,12 @@
 Source9: dovecot.sysconfig
 Source10: http://www.rename-it.nl/dovecot/1.2/%{managesieve_name}-%{managesieve_version}.tar.gz
 Source11: http://www.rename-it.nl/dovecot/1.2/dovecot-%{version}.%{betaver}-managesieve-%{managesieve_version}.diff.gz
-Patch0: dovecot-%{version}.%{betaver}-managesieve-%{managesieve_version}.diff.gz
 
 # 3x Fedora specific
 Patch1: dovecot-1.1-default-settings.patch
 Patch2: dovecot-1.0.beta2-mkcert-permissions.patch
 Patch3: dovecot-1.0.rc7-mkcert-paths.patch
 
-# from upstream, for dovecot <= 1.2.beta4
-Patch4: dovecot-1.2-ldap.patch
-
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: openssl-devel, pam-devel, zlib-devel
 BuildRequires: libtool autoconf automake
@@ -171,11 +167,10 @@
 
 %setup -q -n %{name}-%{version}.%{betaver}
 
-%patch0 -p1 -b .managesieve
+zcat %{SOURCE11} | patch -p1 --fuzz=0 -s
 %patch1 -p1 -b .default-settings
 %patch2 -p1 -b .mkcert-permissions
 %patch3 -p1 -b .mkcert-paths
-%patch4 -p1 -b .ldap
 
 %if %{build_sieve}
 %setup -q -n %{name}-%{version}.%{betaver} -D -T -a 8
@@ -434,6 +429,9 @@
 
 
 %changelog
+* Mon Apr 06 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:1.2-0.rc2.1
+- updated to 1.2.rc2
+
 * Mon Mar 30 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:1.2-0.beta4.2
 - fix typo and rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dovecot/devel/sources,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- sources	30 Mar 2009 14:43:55 -0000	1.54
+++ sources	6 Apr 2009 08:55:28 -0000	1.55
@@ -1,4 +1,4 @@
 a651e2f12a17157d716eedc622032fdc  dovecot-1.2-managesieve-0.11.3.tar.gz
-9f2e1e0f0f18dbb3d31f255e61bbf722  dovecot-1.2.beta4.tar.gz
-f7458682b4e17a0b636068cf0daefd65  dovecot-1.2.beta4-managesieve-0.11.3.diff.gz
+0c568a2eb5170ab287f5f3ef38c13e1a  dovecot-1.2.rc2.tar.gz
+0588f613de160dfee0234954666a6a68  dovecot-1.2.rc2-managesieve-0.11.3.diff.gz
 7acf3d98974a515b868addbdb73054eb  dovecot-sieve-1.1.6.tar.gz


--- dovecot-1.2-ldap.patch DELETED ---