rpms/dovecot/F-11 .cvsignore, 1.56, 1.57 dovecot-1.1-default-settings.patch, 1.7, 1.8 dovecot.spec, 1.129, 1.130 sources, 1.59, 1.60

[Michal Hlavinka]

Author: mhlavink

Update of /cvs/extras/rpms/dovecot/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13670

Modified Files:
	.cvsignore dovecot-1.1-default-settings.patch dovecot.spec 
	sources 
Log Message:
updated to 1.2.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dovecot/F-11/.cvsignore,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- .cvsignore	25 Jun 2009 09:10:30 -0000	1.56
+++ .cvsignore	2 Jul 2009 09:18:40 -0000	1.57
@@ -1,4 +1,5 @@
-dovecot-1.2.rc6.tar.gz
+dovecot-1.2.0.tar.gz
 dovecot-1.2-managesieve-0.11.5.tar.gz
 dovecot-1.2.rc5-managesieve-0.11.5.diff.gz
 dovecot-sieve-1.1.6.tar.gz
+dovecot-1.2-sieve-0.1.6.tar.gz

dovecot-1.1-default-settings.patch:

Index: dovecot-1.1-default-settings.patch
===================================================================
RCS file: /cvs/extras/rpms/dovecot/F-11/dovecot-1.1-default-settings.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- dovecot-1.1-default-settings.patch	18 Jun 2009 07:45:57 -0000	1.7
+++ dovecot-1.1-default-settings.patch	2 Jul 2009 09:18:40 -0000	1.8
@@ -1,6 +1,6 @@
-diff -up dovecot-1.2.rc5/dovecot-example.conf.default-settings dovecot-1.2.rc5/dovecot-example.conf
---- dovecot-1.2.rc5/dovecot-example.conf.default-settings	2009-06-18 07:57:44.749562312 +0200
-+++ dovecot-1.2.rc5/dovecot-example.conf	2009-06-18 07:59:15.923499117 +0200
+diff -up dovecot-1.2.0/dovecot-example.conf.default-settings dovecot-1.2.0/dovecot-example.conf
+--- dovecot-1.2.0/dovecot-example.conf.default-settings	2009-06-18 09:37:43.000000000 +0200
++++ dovecot-1.2.0/dovecot-example.conf	2009-07-02 11:08:41.764015626 +0200
 @@ -10,18 +10,14 @@
  # value inside quotes, eg.: key = "# char and trailing whitespace  "
  
@@ -15,15 +15,15 @@ diff -up dovecot-1.2.rc5/dovecot-example
  # Base directory where to store runtime data.
  #base_dir = /var/run/dovecot/
  
- # Protocols we want to be serving: imap imaps pop3 pop3s managesieve
+ # Protocols we want to be serving: imap imaps pop3 pop3s
  # If you only want to use dovecot-auth, you can set this to "none".
 -#protocols = imap imaps
 +#protocols = imap imaps pop3 pop3s
  
  # A space separated list of IP or host addresses where to listen in for
  # connections. "*" listens in all IPv4 interfaces. "[::]" listens in all IPv6
-@@ -43,13 +39,13 @@
- #     listen = *:12000
+@@ -39,13 +35,13 @@
+ #     listen = *:10100
  #     ..
  #   }
 -#listen = *
@@ -38,7 +38,7 @@ diff -up dovecot-1.2.rc5/dovecot-example
  
  # Should all IMAP and POP3 processes be killed when Dovecot master process
  # shuts down. Setting this to "no" means that Dovecot can be upgraded without
-@@ -96,8 +92,8 @@
+@@ -92,8 +88,8 @@
  # dropping root privileges, so keep the key file unreadable by anyone but
  # root. Included doc/mkcert.sh can be used to easily generate self-signed
  # certificate, just make sure to update the domains in dovecot-openssl.cnf
@@ -49,7 +49,7 @@ diff -up dovecot-1.2.rc5/dovecot-example
  
  # If key file is password protected, give the password here. Alternatively
  # give it when starting dovecot with -p parameter. Since this file is often
-@@ -486,7 +482,7 @@
+@@ -482,7 +478,7 @@
  # locking methods as well. Some operating systems don't allow using some of
  # them simultaneously.
  #mbox_read_locks = fcntl
@@ -58,9 +58,9 @@ diff -up dovecot-1.2.rc5/dovecot-example
  
  # Maximum time in seconds to wait for lock (all of them) before aborting.
  #mbox_lock_timeout = 300
-diff -up dovecot-1.2.rc5/src/master/master-settings.c.default-settings dovecot-1.2.rc5/src/master/master-settings.c
---- dovecot-1.2.rc5/src/master/master-settings.c.default-settings	2009-06-18 07:57:44.764499091 +0200
-+++ dovecot-1.2.rc5/src/master/master-settings.c	2009-06-18 07:57:44.774499405 +0200
+diff -up dovecot-1.2.0/src/master/master-settings.c.default-settings dovecot-1.2.0/src/master/master-settings.c
+--- dovecot-1.2.0/src/master/master-settings.c.default-settings	2009-06-30 17:18:39.000000000 +0200
++++ dovecot-1.2.0/src/master/master-settings.c	2009-07-02 11:05:21.101078306 +0200
 @@ -178,8 +178,8 @@ struct settings default_settings = {
  	MEMBER(syslog_facility) "mail",
  


Index: dovecot.spec
===================================================================
RCS file: /cvs/extras/rpms/dovecot/F-11/dovecot.spec,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -p -r1.129 -r1.130
--- dovecot.spec	25 Jun 2009 09:10:30 -0000	1.129
+++ dovecot.spec	2 Jul 2009 09:18:40 -0000	1.130
@@ -1,9 +1,8 @@
 Summary: Dovecot Secure imap server
 Name: dovecot
 Epoch: 1
-Version: 1.2
-%define betaver rc6
-Release: 0.%{betaver}.1%{?dist}
+Version: 1.2.0
+Release: 1%{?dist}
 License: MIT and LGPLv2 and BSD with advertising
 Group: System Environment/Daemons
 
@@ -15,13 +14,14 @@ Group: System Environment/Daemons
 
 %define build_sieve 1
 %define build_managesieve 1
-%define sieve_version 1.1.6
-%define sieve_name dovecot-sieve
+%define sieve_version 0.1.6
+%define sieve_name dovecot-1.2-sieve
 %define managesieve_version 0.11.5
-%define managesieve_name dovecot-%{version}-managesieve
+#define managesieve_name dovecot-%{version}-managesieve
+%define managesieve_name dovecot-1.2-managesieve
 
 URL: http://www.dovecot.org/
-Source: http://www.dovecot.org/releases/1.2/%{name}-%{version}.%{betaver}.tar.gz
+Source: http://www.dovecot.org/releases/1.2/%{name}-%{version}.tar.gz
 Source1: dovecot.init
 Source2: dovecot.pam
 Source3: maildir-migration.txt
@@ -29,7 +29,8 @@ Source4: migrate-folders
 Source5: migrate-users
 Source6: perfect_maildir.pl
 Source7: dovecot-REDHAT-FAQ.txt
-Source8: http://dovecot.org/releases/sieve/%{sieve_name}-%{sieve_version}.tar.gz
+#Source8: http://dovecot.org/releases/sieve/%{sieve_name}-%{sieve_version}.tar.gz
+Source8: http://www.rename-it.nl/dovecot/1.2/%{sieve_name}-%{sieve_version}.tar.gz
 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}.rc5-managesieve-%{managesieve_version}.diff.gz
@@ -166,7 +167,7 @@ This package provides the development fi
 
 %prep
 
-%setup -q -n %{name}-%{version}.%{betaver}
+%setup -q
 
 zcat %{SOURCE11} | patch -p1 --fuzz=0 -s
 %patch1 -p1 -b .default-settings
@@ -174,11 +175,11 @@ zcat %{SOURCE11} | patch -p1 --fuzz=0 -s
 %patch3 -p1 -b .mkcert-paths
 
 %if %{build_sieve}
-%setup -q -n %{name}-%{version}.%{betaver} -D -T -a 8
+%setup -q -D -T -a 8
 %endif
 
 %if %{build_managesieve}
-%setup -q -n %{name}-%{version}.%{betaver} -D -T -a 10
+%setup -q -D -T -a 10
 %endif
 
 %patch4 -p1 -b .managesievetrim
@@ -432,6 +433,9 @@ fi
 
 
 %changelog
+* Thu Jul 02 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:1.2.0-1
+- updated to 1.2.0
+
 * Thu Jun 25 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:1.2-0.rc6.1
 - updated to 1.2.rc6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dovecot/F-11/sources,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- sources	25 Jun 2009 09:10:30 -0000	1.59
+++ sources	2 Jul 2009 09:18:40 -0000	1.60
@@ -1,4 +1,5 @@
-6d33021cd7edbf0e7feff058fb0e99ae  dovecot-1.2.rc6.tar.gz
+b382fa5c6551086568c21567f23e2dc3  dovecot-1.2.0.tar.gz
 9b59508d076d96c16e2443e87c308fe4  dovecot-1.2-managesieve-0.11.5.tar.gz
 544c086bd3beaf54eacb9245eae81115  dovecot-1.2.rc5-managesieve-0.11.5.diff.gz
 7acf3d98974a515b868addbdb73054eb  dovecot-sieve-1.1.6.tar.gz
+4d9ec0ac3b61c71becc583ccd011a71c  dovecot-1.2-sieve-0.1.6.tar.gz