|
|
@@ -1,7 +1,7 @@
|
|
|
Summary: Dovecot Secure imap server
|
|
|
Summary(ja): Dovecot セキュア IMAP サーバ
|
|
|
Name: dovecot
|
|
|
-Version: 2.0.21
|
|
|
+Version: 2.1.10
|
|
|
Release: 1%{?_dist_release}
|
|
|
#dovecot itself is MIT, a few sources are PD, pigeonhole is LGPLv2
|
|
|
License: MIT and LGPLv2 and BSD with advertising
|
|
|
@@ -14,17 +14,17 @@ Group: System Environment/Daemons
|
|
|
|
|
|
# pigeonhole
|
|
|
%define build_pigeonhole 1
|
|
|
-%define pigeonholever 0.2.6
|
|
|
+%define pigeonholever 0.3.3
|
|
|
|
|
|
# pop before smtp (drac)
|
|
|
%define build_drac 1
|
|
|
|
|
|
URL: http://www.dovecot.org/
|
|
|
|
|
|
-Source: http://www.dovecot.org/releases/2.0/%{name}-%{version}.tar.gz
|
|
|
+Source: http://www.dovecot.org/releases/2.1/%{name}-%{version}.tar.gz
|
|
|
Source1: dovecot.init
|
|
|
Source2: dovecot.pam
|
|
|
-Source8: http://www.rename-it.nl/dovecot/2.0/dovecot-2.0-pigeonhole-%{pigeonholever}.tar.gz
|
|
|
+Source8: http://www.rename-it.nl/dovecot/2.1/dovecot-2.1-pigeonhole-%{pigeonholever}.tar.gz
|
|
|
Source9: dovecot.sysconfig
|
|
|
Source10: dovecot.tmpfilesd
|
|
|
|
|
|
@@ -185,7 +185,6 @@ cp %{SOURCE110} .
|
|
|
# autoreconf -i -f
|
|
|
%configure \
|
|
|
INSTALL_DATA="install -c -p -m644" \
|
|
|
- --enable-header-install \
|
|
|
--disable-static \
|
|
|
%if %{build_postgres}
|
|
|
--with-pgsql \
|
|
|
@@ -197,20 +196,23 @@ cp %{SOURCE110} .
|
|
|
--with-sqlite \
|
|
|
%endif
|
|
|
--with-sql=plugin \
|
|
|
- --with-sql-drivers \
|
|
|
+ --with-gssapi=plugin \
|
|
|
--with-ssl=openssl \
|
|
|
--with-ssldir=%{ssldir} \
|
|
|
--with-libcap \
|
|
|
--with-zlib \
|
|
|
%if %{build_ldap}
|
|
|
- --with-ldap=plugin
|
|
|
+ --with-ldap=plugin \
|
|
|
%endif
|
|
|
+ --with-docs
|
|
|
+
|
|
|
+sed -i 's|/etc/ssl|/etc/pki/dovecot|' doc/mkcert.sh doc/example-config/conf.d/10-ssl.conf
|
|
|
|
|
|
make %{?_smp_mflags}
|
|
|
|
|
|
%if %{build_pigeonhole}
|
|
|
#pigeonhole
|
|
|
-pushd dovecot-2.0-pigeonhole-%{pigeonholever}
|
|
|
+pushd dovecot-2.1-pigeonhole-%{pigeonholever}
|
|
|
autoreconf -fiv
|
|
|
%configure \
|
|
|
INSTALL_DATA="install -c -p -m644" \
|
|
|
@@ -234,7 +236,7 @@ make install DESTDIR=$RPM_BUILD_ROOT
|
|
|
rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}
|
|
|
|
|
|
%if %{build_pigeonhole}
|
|
|
-pushd dovecot-2.0-pigeonhole-%{pigeonholever}
|
|
|
+pushd dovecot-2.1-pigeonhole-%{pigeonholever}
|
|
|
make install DESTDIR=$RPM_BUILD_ROOT
|
|
|
popd
|
|
|
%endif
|
|
|
@@ -284,7 +286,7 @@ install -p -m 644 doc/example-config/conf.d/*.conf.ext $RPM_BUILD_ROOT%{_sysconf
|
|
|
install -p -m 644 doc/dovecot-openssl.cnf $RPM_BUILD_ROOT%{ssldir}/dovecot-openssl.cnf
|
|
|
|
|
|
# Install pigeonhole conf
|
|
|
-pushd dovecot-2.0-pigeonhole-%{pigeonholever}
|
|
|
+pushd dovecot-2.1-pigeonhole-%{pigeonholever}
|
|
|
install -p -m 644 doc/example-config/conf.d/*.conf $RPM_BUILD_ROOT%{_sysconfdir}/dovecot/conf.d
|
|
|
popd
|
|
|
|
|
|
@@ -358,7 +360,7 @@ fi
|
|
|
|
|
|
%check
|
|
|
make check
|
|
|
-cd dovecot-2.0-pigeonhole-%{pigeonholever}
|
|
|
+cd dovecot-2.1-pigeonhole-%{pigeonholever}
|
|
|
make check
|
|
|
|
|
|
%files -f libs.filelist
|
|
|
@@ -384,6 +386,9 @@ make check
|
|
|
%attr(0600,root,root) %ghost %config(missingok,noreplace) %verify(not md5 size mtime) %{ssldir}/private/dovecot.pem
|
|
|
|
|
|
%{_libexecdir}/%{name}
|
|
|
+%{_libdir}/dovecot/auth/libauthdb_imap.so
|
|
|
+%{_libdir}/dovecot/auth/libmech_gssapi.so
|
|
|
+
|
|
|
%{_sbindir}/dovecot
|
|
|
# %{_sbindir}/dovecotpw
|
|
|
%{_bindir}/doveadm
|
|
|
@@ -407,6 +412,7 @@ make check
|
|
|
%files pigeonhole
|
|
|
%defattr(-,root,root,-)
|
|
|
%{_bindir}/sieve-dump
|
|
|
+%{_bindir}/sieve-filter
|
|
|
%{_bindir}/sieve-test
|
|
|
%{_bindir}/sievec
|
|
|
%config(noreplace) %{_sysconfdir}/dovecot/conf.d/90-sieve.conf
|
|
|
@@ -417,8 +423,9 @@ make check
|
|
|
%dir %{_libdir}/dovecot/settings
|
|
|
%{_libdir}/dovecot/settings/libmanagesieve_*.so
|
|
|
|
|
|
-%{_mandir}/man1/sieve-test.1.gz
|
|
|
%{_mandir}/man1/sieve-dump.1.gz
|
|
|
+%{_mandir}/man1/sieve-filter.1.gz
|
|
|
+%{_mandir}/man1/sieve-test.1.gz
|
|
|
%{_mandir}/man1/sievec.1.gz
|
|
|
%{_mandir}/man1/sieved.1.gz
|
|
|
%{_mandir}/man7/pigeonhole.7.gz
|
|
|
@@ -470,6 +477,13 @@ make check
|
|
|
%{_datadir}/aclocal/dovecot.m4
|
|
|
|
|
|
%changelog
|
|
|
+* Thu Oct 25 2012 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 2.1.10-1
|
|
|
+- new upstream release 2.1.10
|
|
|
+- new upstream release pigeonhole 0.3.3
|
|
|
+- change configure options to fit new release
|
|
|
+- change file list to fit new release
|
|
|
+- fix openssl key location in defalut config files
|
|
|
+
|
|
|
* Sat Jun 16 2012 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 2.0.21-1
|
|
|
- new upstream release
|
|
|
- new upstream release pigeonhole 0.2.6
|
iwamoto