X-Git-Url: http://git.pld-linux.org/?p=packages%2Fdovecot.git;a=blobdiff_plain;f=dovecot.spec;h=ba4c4c389baf7006926ed176517112fd80b527a7;hp=64361af17439c830054ca951a5846a672f06434a;hb=b4b3817b729a7ba040d4db70798061449b3cf35a;hpb=bd7f523372ee256279e294d4f1042bdafb25311e diff --git a/dovecot.spec b/dovecot.spec index 64361af..ba4c4c3 100644 --- a/dovecot.spec +++ b/dovecot.spec @@ -10,18 +10,19 @@ 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.4 -Release: 1 +Version: 2.2.13 +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: 9a360fc39462da71e2bfd1d6928f3902 +Source0: http://dovecot.org/releases/2.2/%{name}-%{version}.tar.gz +# Source0-md5: a3eb1c0b1822c4f2b0fe9247776baa71 Source1: %{name}.pamd Source2: %{name}.init Source3: %{name}.sysconfig Source4: %{name}.tmpfiles Patch0: %{name}-config.patch +Patch1: %{name}-rpath.patch URL: http://dovecot.org/ BuildRequires: autoconf BuildRequires: automake @@ -37,6 +38,7 @@ 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 +146,7 @@ Współdzielone biblioteki Dovecota. %prep %setup -q %patch0 -p1 +%patch1 -p1 %{__sed} -i 's,/usr/lib/dovecot,%{_libdir}/dovecot,g' doc/example-config/*.conf doc/example-config/conf.d/*.conf @@ -171,7 +174,7 @@ touch config.rpath --with-moduledir=%{_libdir}/%{name}/plugins \ --with-ssldir=/var/lib/openssl \ --sysconfdir=%{_sysconfdir} \ - --with-systemdsystemunitdir=/lib/systemd/system + --with-systemdsystemunitdir=%{systemdunitdir} %{__make} @@ -195,8 +198,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 +213,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 +229,7 @@ if [ "$1" = "0" ]; then %userremove dovenull %groupremove dovenull fi +%systemd_reload %post libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig @@ -263,6 +267,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 +303,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 +314,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 +330,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,12 +345,12 @@ 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-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 @@ -345,16 +358,16 @@ fi %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-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-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