rpms/dovecot/F-12 dovecot.spec,1.144,1.145

[Michal Hlavinka]

Author: mhlavink

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

Modified Files:
	dovecot.spec 
Log Message:
* Mon Nov 02 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:1.2.6-5
- spec cleanup



Index: dovecot.spec
===================================================================
RCS file: /cvs/extras/rpms/dovecot/F-12/dovecot.spec,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -p -r1.144 -r1.145
--- dovecot.spec	21 Oct 2009 10:44:31 -0000	1.144
+++ dovecot.spec	2 Nov 2009 16:47:59 -0000	1.145
@@ -2,7 +2,7 @@ Summary: Secure imap and pop3 server
 Name: dovecot
 Epoch: 1
 Version: 1.2.6
-Release: 4%{?dist}
+Release: 5%{?dist}
 #dovecot itself is MIT, a few sources are PD, (manage)sieve is LGPLv2, perfect_maildir.pl is GPLv2+
 License: MIT and LGPLv2 and GPLv2+
 Group: System Environment/Daemons
@@ -89,18 +89,18 @@ Dovecot is an IMAP server for Linux/UNIX
 primarily in mind.  It also contains a small POP3 server.  It supports mail 
 in either of maildir or mbox formats.
 
-The SQL drivers and authentication plugins are in their subpackages.
+The SQL drivers and authentication plug-ins are in their subpackages.
 
 
 %if %{build_sieve}
 %package sieve
 Requires: %{name} = %{epoch}:%{version}-%{release}
-Summary: Sieve plugin for dovecot LDA
+Summary: Sieve plug-in for dovecot LDA
 Group: System Environment/Daemons
 License: MIT and LGPLv2+
 
 %description sieve
-This package provides sieve plugin version %{sieve_version} for dovecot LDA.
+This package provides sieve plug-in version %{sieve_version} for dovecot LDA.
 %endif
 
 %if %{build_managesieve}
@@ -108,7 +108,7 @@ This package provides sieve plugin versi
 Requires: %{name} = %{epoch}:%{version}-%{release}
 Summary: Manage Sieve daemon for dovecot
 Group: System Environment/Daemons
-License: LGPLv2.1
+License: LGPLv2
 
 %description managesieve
 This package provides the Manage Sieve daemon version %{managesieve_version} for dovecot.
@@ -117,51 +117,51 @@ This package provides the Manage Sieve d
 %if %{build_postgres}
 %package pgsql
 Requires: %{name} = %{epoch}:%{version}-%{release}
-Summary: Postgres SQL backend for dovecot
+Summary: Postgres SQL back end for dovecot
 Group: System Environment/Daemons
 %description pgsql
-This package provides the Postgres SQL backend for dovecot-auth etc.
+This package provides the Postgres SQL back end for dovecot-auth etc.
 %endif
 
 %if %{build_mysql}
 %package mysql
 Requires: %{name} = %{epoch}:%{version}-%{release}
-Summary: MySQL backend for dovecot
+Summary: MySQL back end for dovecot
 Group: System Environment/Daemons
 %description mysql
-This package provides the MySQL backend for dovecot-auth etc.
+This package provides the MySQL back end for dovecot-auth etc.
 %endif
 
 %if %{build_sqlite}
 %package sqlite
 Requires: %{name} = %{epoch}:%{version}-%{release}
-Summary: SQLite backend for dovecot
+Summary: SQLite back end for dovecot
 Group: System Environment/Daemons
 %description sqlite
-This package provides the SQLite backend for dovecot-auth etc.
+This package provides the SQLite back end for dovecot-auth etc.
 %endif
 
 %if %{build_ldap}
 %package ldap
 Requires: %{name} = %{epoch}:%{version}-%{release}
-Summary: LDAP auth plugin for dovecot
+Summary: LDAP auth plug-in for dovecot
 Group: System Environment/Daemons
 %description ldap
-This package provides the LDAP auth plugin for dovecot-auth etc.
+This package provides the LDAP auth plug-in for dovecot-auth etc.
 %endif
 
 %if %{build_gssapi}
 %package gssapi
 Requires: %{name} = %{epoch}:%{version}-%{release}
-Summary: GSSAPI auth mechanism plugin for dovecot
+Summary: GSSAPI auth mechanism plug-in for dovecot
 Group: System Environment/Daemons
 %description gssapi
-This package provides the GSSAPI auth mechanism plugin for dovecot-auth etc.
+This package provides the GSSAPI auth mechanism plug-in for dovecot-auth etc.
 %endif
 
 %package devel
 Requires: %{name} = %{epoch}:%{version}-%{release}
-Summary: Development files dor dovecot
+Summary: Development files for dovecot
 Group: Development/Libraries
 %description devel
 This package provides the development files for dovecot.
@@ -294,9 +294,20 @@ do
     install -p -m644 $f $RPM_BUILD_ROOT%{docdir}/UW-to-Dovecot-Migration
 done
 
+# fix encoding
+pushd $RPM_BUILD_ROOT
+for fe in ./%{docdir}/auth-protocol.txt
+do
+  iconv -f iso-8859-1 -t utf-8 <$fe >$fe.new
+  touch -r $fe $fe.new
+  mv -f $fe.new $fe
+done
+popd
+
 mv $RPM_BUILD_ROOT%{docdir} $RPM_BUILD_ROOT%{docdir}-%{version}
 mkdir -p $RPM_BUILD_ROOT/var/lib/dovecot
 
+
 %if %{build_sieve}
 # dovecot-sieve
 pushd %{sieve_name}-%{sieve_version}
@@ -441,6 +452,9 @@ fi
 
 
 %changelog
+* Mon Nov 02 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:1.2.6-5
+- spec cleanup
+
 * Wed Oct 21 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:1.2.6-4
 - imap-login: If imap_capability is set, show it in the banner 
   instead of the default (#524485)