rpms/dovecot/FC-6 dovecot.spec,1.66,1.67

[fedora-cvs-commits at redhat.com]

Author: tjanouse

Update of /cvs/dist/rpms/dovecot/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv20149

Modified Files:
	dovecot.spec 
Log Message:
* Fri Apr 20 2007 Tomas Janousek <tjanouse at redhat.com> - 1.0.0-3
- merge from devel:
    - dovecot-1.0.beta2-pam-tty.patch is no longer needed
    - update to latest upstream (1.0.0)
    - update to latest upstream (1.0.rc31)
    - update to latest upstream (1.0.rc30)



Index: dovecot.spec
===================================================================
RCS file: /cvs/dist/rpms/dovecot/FC-6/dovecot.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- dovecot.spec	30 Mar 2007 12:04:12 -0000	1.66
+++ dovecot.spec	20 Apr 2007 12:46:16 -0000	1.67
@@ -1,6 +1,8 @@
-%define pkg_version 1.0
-%define my_release 2
-%define pkg_release %{my_release}.rc28%{?dist}
+%define upstream 1.0.0
+%define sieve_upstream 1.0.1
+%define pkg_version 1.0.0
+%define my_release 3
+%define pkg_release %{my_release}%{?dist}
 %define pkg_sieve_version 1.0.1
 %define pkg_sieve_release %{my_release}%{?dist}
 
@@ -13,11 +15,9 @@
 
 %define build_postgres 1
 %define build_mysql 1
-%define upstream 1.0.rc28
 
 %define build_sieve 0
 %define sieve_name dovecot-sieve
-%define sieve_upstream 1.0.1
 
 Source: http://dovecot.org/releases/%{name}-%{upstream}.tar.gz
 Source1: dovecot.init
@@ -29,7 +29,7 @@
 Source7: dovecot-REDHAT-FAQ.txt
 Source8: http://dovecot.org/releases/sieve/%{sieve_name}-%{sieve_upstream}.tar.gz
 Patch100: dovecot-1.0.rc15-default-settings.patch
-Patch101: dovecot-1.0.beta2-pam-tty.patch
+#Patch101: dovecot-1.0.beta2-pam-tty.patch
 Patch102: dovecot-1.0.rc2-pam-setcred.patch
 Patch103: dovecot-1.0.beta2-mkcert-permissions.patch
 # 104 not applied
@@ -102,7 +102,7 @@
 %setup -q -n %{name}-%{upstream}
 
 %patch100 -p1 -b .default-settings
-%patch101 -p2 -b .pam-tty
+#%patch101 -p2 -b .pam-tty
 %patch102 -p1 -b .pam-setcred
 %patch103 -p1 -b .mkcert-permissions
 #%patch104 -p1 -b .lib64
@@ -295,6 +295,13 @@
 
 
 %changelog
+* Fri Apr 20 2007 Tomas Janousek <tjanouse at redhat.com> - 1.0.0-3
+- merge from devel:
+    - dovecot-1.0.beta2-pam-tty.patch is no longer needed
+    - update to latest upstream (1.0.0)
+    - update to latest upstream (1.0.rc31)
+    - update to latest upstream (1.0.rc30)
+
 * Fri Mar 30 2007 Tomas Janousek <tjanouse at redhat.com> - 1.0-2.rc28
 - merge from devel:
     - spec file cleanup (fixes docs path)