X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=dovecot.spec;h=c208579dc1318e732982c04d189c5203599d78d2;hb=b9750edc892de477b2c1295aec7c598c124b77c8;hp=1e771c36d5a3583ac9175545541af4f991901933;hpb=692c6c7d82401e5a0ee91dcb2ae1ca8c68fc2ffb;p=packages%2Fdovecot.git diff --git a/dovecot.spec b/dovecot.spec index 1e771c3..c208579 100644 --- a/dovecot.spec +++ b/dovecot.spec @@ -6,37 +6,47 @@ %bcond_without pgsql # without PostgreSQL auth %bcond_without sqlite # without SQLite3 auth %bcond_without sasl # without SASL auth +%bcond_without tests # tests Summary: IMAP and POP3 server written with security primarily in mind Summary(pl.UTF-8): Serwer IMAP i POP3 pisany głównie z myślą o bezpieczeństwie Name: dovecot -Version: 2.1.6 -Release: 1 +Version: 2.2.15 +Release: 2 Epoch: 1 License: MIT (libraries), LGPL v2.1 (the rest) Group: Networking/Daemons -Source0: http://dovecot.org/releases/2.1/%{name}-%{version}.tar.gz -# Source0-md5: 56d2a8d5273d39caa41d6a8dd9f4442c +Source0: http://dovecot.org/releases/2.2/%{name}-%{version}.tar.gz +# Source0-md5: c6c176943bd832c780fbb5d2f8850952 Source1: %{name}.pamd Source2: %{name}.init Source3: %{name}.sysconfig Source4: %{name}.tmpfiles Patch0: %{name}-config.patch +Patch1: %{name}-rpath.patch +Patch2: %{name}-exttextcat.patch URL: http://dovecot.org/ BuildRequires: autoconf BuildRequires: automake BuildRequires: bzip2-devel +BuildRequires: clucene-core-devel >= 2.3.3.4 +BuildRequires: curl-devel %{?with_sasl:BuildRequires: cyrus-sasl-devel >= 2.0} +BuildRequires: expat-devel BuildRequires: gettext-devel %{?with_gssapi:BuildRequires: heimdal-devel} BuildRequires: libcap-devel +BuildRequires: libstemmer-devel +BuildRequires: libexttextcat-devel BuildRequires: libtool +BuildRequires: lz4-devel %{?with_mysql:BuildRequires: mysql-devel} %{?with_ldap:BuildRequires: openldap-devel >= 2.3.3} BuildRequires: openssl-devel >= 0.9.7d BuildRequires: pam-devel BuildRequires: pkgconfig %{?with_pgsql:BuildRequires: postgresql-devel} +BuildRequires: rpmbuild(macros) >= 1.647 BuildRequires: sed >= 4.0 %{?with_sqlite:BuildRequires: sqlite3-devel} BuildRequires: zlib-devel @@ -144,6 +154,8 @@ Współdzielone biblioteki Dovecota. %prep %setup -q %patch0 -p1 +%patch1 -p1 +%patch2 -p1 %{__sed} -i 's,/usr/lib/dovecot,%{_libdir}/dovecot,g' doc/example-config/*.conf doc/example-config/conf.d/*.conf @@ -155,6 +167,7 @@ touch config.rpath %{__autoheader} %{__automake} %configure \ + CPPFLAGS="%{rpmcppflags} -I/usr/include/libstemmer" \ --disable-static \ %{?debug:--enable-debug} \ %{?with_ldap:--with-ldap=yes} \ @@ -162,6 +175,9 @@ touch config.rpath %{?with_pgsql:--with-pgsql} \ %{?with_sqlite:--with-sqlite} \ %{?with_gssapi:--with-gssapi=plugin} \ + --with-lucene \ + --with-stemmer \ + --with-solr \ --with-sql=plugin \ --with-pam \ --with-zlib \ @@ -171,10 +187,12 @@ touch config.rpath --with-moduledir=%{_libdir}/%{name}/plugins \ --with-ssldir=/var/lib/openssl \ --sysconfdir=%{_sysconfdir} \ - --with-systemdsystemunitdir=/lib/systemd/system + --with-systemdsystemunitdir=%{systemdunitdir} %{__make} +%{?with_tests:%{__make} check} + %install rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT/etc/{pam.d,rc.d/init.d,sysconfig,security} \ @@ -195,8 +213,6 @@ touch $RPM_BUILD_ROOT/etc/security/blacklist.imap find $RPM_BUILD_ROOT%{_libdir}/%{name} -name '*.la' | xargs rm -mv $RPM_BUILD_ROOT%{_libdir}/%{name}/dovecot-config $RPM_BUILD_ROOT%{_libdir}/%{name}-devel - %{__rm} -r $RPM_BUILD_ROOT%{_docdir}/%{name} %{__rm} -r $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/README @@ -212,12 +228,14 @@ rm -rf $RPM_BUILD_ROOT %post /sbin/chkconfig --add dovecot %service dovecot restart +%systemd_post dovecot.socket dovecot.service %preun if [ "$1" = "0" ]; then %service dovecot stop /sbin/chkconfig --del dovecot fi +%systemd_preun dovecot.service dovecot.socket %postun if [ "$1" = "0" ]; then @@ -226,6 +244,7 @@ if [ "$1" = "0" ]; then %userremove dovenull %groupremove dovenull fi +%systemd_reload %post libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig @@ -263,6 +282,9 @@ if [ "$i" -eq 1 ]; then echo "Please verify contents of %{_sysconfdir}/%{name}/* files." fi +%triggerpostun -- %{name} < 1:2.2.4-2 +%systemd_trigger dovecot.service dovecot.socket + %files %defattr(644,root,root,755) # COPYING contains some notes, not actual LGPL text @@ -296,6 +318,9 @@ fi %attr(755,root,root) %{_libdir}/%{name}/gdbhelper %attr(755,root,root) %{_libdir}/%{name}/imap %attr(755,root,root) %{_libdir}/%{name}/imap-login +%attr(755,root,root) %{_libdir}/%{name}/imap-urlauth +%attr(755,root,root) %{_libdir}/%{name}/imap-urlauth-login +%attr(755,root,root) %{_libdir}/%{name}/imap-urlauth-worker %attr(755,root,root) %{_libdir}/%{name}/indexer %attr(755,root,root) %{_libdir}/%{name}/indexer-worker %attr(755,root,root) %{_libdir}/%{name}/ipc @@ -304,6 +329,7 @@ fi %attr(755,root,root) %{_libdir}/%{name}/maildirlock %attr(755,root,root) %{_libdir}/%{name}/pop3 %attr(755,root,root) %{_libdir}/%{name}/pop3-login +%attr(755,root,root) %{_libdir}/%{name}/quota-status %attr(755,root,root) %{_libdir}/%{name}/rawlog %attr(755,root,root) %{_libdir}/%{name}/replicator %attr(755,root,root) %{_libdir}/%{name}/script @@ -319,6 +345,8 @@ fi %attr(755,root,root) %{_libdir}/%{name}/plugins/dict/*.so %dir %{_libdir}/%{name}/plugins/doveadm %attr(755,root,root) %{_libdir}/%{name}/plugins/doveadm/*.so +%{systemdunitdir}/dovecot.service +%{systemdunitdir}/dovecot.socket /usr/lib/tmpfiles.d/%{name}.conf %dir /var/lib/dovecot %dir /var/run/dovecot @@ -332,29 +360,33 @@ fi %files devel %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/%{name}/libdovecot.so +%attr(755,root,root) %{_libdir}/%{name}/libdovecot-compression.so +%attr(755,root,root) %{_libdir}/%{name}/libdovecot-dsync.so %attr(755,root,root) %{_libdir}/%{name}/libdovecot-lda.so %attr(755,root,root) %{_libdir}/%{name}/libdovecot-login.so %attr(755,root,root) %{_libdir}/%{name}/libdovecot-sql.so -%attr(755,root,root) %{_libdir}/%{name}/libdovecot-ssl.so %attr(755,root,root) %{_libdir}/%{name}/libdovecot-storage.so -%{_libdir}/%{name}-devel +%{_libdir}/%{name}/%{name}-config %{_includedir}/%{name} %{_aclocaldir}/dovecot.m4 %files libs %defattr(644,root,root,755) %dir %{_libdir}/%{name} + %attr(755,root,root) %{_libdir}/%{name}/libdovecot.so.0.0.0 +%attr(755,root,root) %{_libdir}/%{name}/libdovecot-compression.so.0.0.0 +%attr(755,root,root) %{_libdir}/%{name}/libdovecot-dsync.so.0.0.0 %attr(755,root,root) %{_libdir}/%{name}/libdovecot-lda.so.0.0.0 %attr(755,root,root) %{_libdir}/%{name}/libdovecot-login.so.0.0.0 %attr(755,root,root) %{_libdir}/%{name}/libdovecot-sql.so.0.0.0 -%attr(755,root,root) %{_libdir}/%{name}/libdovecot-ssl.so.0.0.0 %attr(755,root,root) %{_libdir}/%{name}/libdovecot-storage.so.0.0.0 # Note: we are in %{_libdir}/dovecot, ldconfig does not look into this # directory. This is why the following files are not %ghost %attr(755,root,root) %{_libdir}/%{name}/libdovecot.so.0 +%attr(755,root,root) %{_libdir}/%{name}/libdovecot-compression.so.0 +%attr(755,root,root) %{_libdir}/%{name}/libdovecot-dsync.so.0 %attr(755,root,root) %{_libdir}/%{name}/libdovecot-lda.so.0 %attr(755,root,root) %{_libdir}/%{name}/libdovecot-login.so.0 %attr(755,root,root) %{_libdir}/%{name}/libdovecot-sql.so.0 -%attr(755,root,root) %{_libdir}/%{name}/libdovecot-ssl.so.0 %attr(755,root,root) %{_libdir}/%{name}/libdovecot-storage.so.0