-
-%define dovecot_series 2.0
-%define pigeonhole_version 0.2.1
-
+# TODO
+# - new unpackaged files:
+# /usr/bin/sieve-filter
+# /usr/share/man/man1/sieve-filter.1.gz
+# - fix mess with dovecot libraries (symlinks in package that shouldn't be here)
+
+%define dovecot_series 2.2
+%define pigeonhole_version 0.4.2
Summary: Sieve plugin for dovecot
Summary(pl.UTF-8): Wtyczka Sieve i Managesieve dla dovecota
Name: dovecot-pigeonhole
Version: %{dovecot_series}_%{pigeonhole_version}
-Release: 2
+Release: 1
License: LGPL
Group: Daemons
Source0: http://www.rename-it.nl/dovecot/%{dovecot_series}/dovecot-%{dovecot_series}-pigeonhole-%{pigeonhole_version}.tar.gz
-# Source0-md5: 7baf6ebac21bdb865cb733d8e96ee81b
+# Source0-md5: e8cb4976db9811d37e9d870f2f75ffef
Patch0: %{name}-config.patch
-URL: http://www.dovecot.org/
+URL: http://pigeonhole.dovecot.org/
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: bison
-BuildRequires: dovecot-devel >= 1:2.0
+BuildRequires: dovecot-devel >= 1:%{dovecot_series}
BuildRequires: flex
BuildRequires: libtool
%requires_eq_to dovecot dovecot-devel
%define skip_post_check_so libdovecot-sieve.so.0.0.0
%description
-Dovecot Pigeonhole is implementation of Sieve for Dovecot v2.X
+Dovecot Pigeonhole is implementation of Sieve for Dovecot v2.x
%description -l pl.UTF-8
-Dovecot Pigeonhole jest implementacjÄ… Sieve dla Dovecot v2.X
+Dovecot Pigeonhole jest implementacjÄ… Sieve dla Dovecot v2.x
%package devel
Summary: Libraries and headers for %{name}
%patch0 -p1
%build
-
%configure \
- --with-dovecot=%{_libdir}/dovecot \
- --with-managesieve=yes \
- --enable-header-install=yes \
- --prefix=%{_libdir}/dovecot
+ --with-dovecot=%{_libdir}/dovecot \
+ --with-managesieve=yes \
+ --prefix=%{_libdir}/dovecot
%{__make}
%install
-
rm -rf $RPM_BUILD_ROOT
-
-%{__make} install DESTDIR=$RPM_BUILD_ROOT
+%{__make} install \
+ DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT%{_libdir}/dovecot/ -name '*.la' | xargs rm -f
find $RPM_BUILD_ROOT%{_libdir}/dovecot/ -name '*.a' | xargs rm -f
+
+# ??? - why are these in this package?
ln -s dovecot/libdovecot-login.so.0.0.0 $RPM_BUILD_ROOT%{_libdir}/libdovecot-login.so.0
ln -s dovecot/libdovecot.so.0.0.0 $RPM_BUILD_ROOT%{_libdir}/libdovecot.so.0
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}
+
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
+%doc doc/example-config/conf.d/90-sieve.conf
+%doc doc/extensions doc/script-location-dict.txt
%attr(755,root,root) %{_bindir}/sieve-test
+%attr(755,root,root) %{_bindir}/sieve-filter
%attr(755,root,root) %{_bindir}/sievec
%attr(755,root,root) %{_bindir}/sieve-dump
-%{_libdir}/dovecot/plugins/lib90_sieve_plugin.so
+%attr(755,root,root) %{_libdir}/dovecot/plugins/lib90_sieve_plugin.so
%attr(755,root,root) %{_libdir}/dovecot/libdovecot-sieve.so*
-
-%attr(755,root,root) %{_libdir}/libdovecot.so.0
+%attr(755,root,root) %{_libdir}/dovecot/plugins/doveadm/lib10_doveadm_sieve_plugin.so
+%dir %{_libdir}/dovecot/sieve
+%attr(755,root,root) %{_libdir}/dovecot/sieve/lib90_sieve_extprograms_plugin.so
%{_mandir}/man1/sieve-test.1*
+%{_mandir}/man1/sieve-filter.1.gz
%{_mandir}/man1/sievec.1*
%{_mandir}/man1/sieved.1*
%{_mandir}/man1/sieve-dump.1*
%{_mandir}/man7/pigeonhole.7*
-%{_docdir}/dovecot/example-config/conf.d/90-sieve.conf
-%{_docdir}/dovecot/sieve
%files devel
%defattr(644,root,root,755)
%files -n dovecot-managesieve
%defattr(644,root,root,755)
+%doc doc/example-config/conf.d/20-managesieve.conf
%attr(755,root,root) %{_libexecdir}/dovecot/managesieve
%attr(755,root,root) %{_libexecdir}/dovecot/managesieve-login
-%attr(755,root,root) %{_libdir}/libdovecot-login.so.0
-
%dir %{_libdir}/dovecot/plugins/settings/
%{_libdir}/dovecot/plugins/settings/libmanagesieve_login_settings.so
%{_libdir}/dovecot/plugins/settings/libmanagesieve_settings.so
-%{_libexecdir}/dovecot/managesieve
-%{_libexecdir}/dovecot/managesieve-login
-%{_docdir}/dovecot/example-config/conf.d/20-managesieve.conf