- new, 0.3.4 for dovecot 2.1.x

diff --git a/dovecot-pigeonhole-config.patch b/dovecot-pigeonhole-config.patch
new file mode 100644 (file)
index 0000000..e9c8436
--- /dev/null
+++ b/dovecot-pigeonhole-config.patch
@@ -0,0 +1,42 @@
+diff -ruN dovecot-2.1-pigeonhole-0.3.1/configure dovecot-2.1-pigeonhole-0.3.1-new/configure
+--- dovecot-2.1-pigeonhole-0.3.1/configure     2012-05-25 21:32:09.000000000 +0000
++++ dovecot-2.1-pigeonhole-0.3.1/configure     2012-06-10 09:46:34.761871135 +0000
+@@ -11385,19 +11385,19 @@
+ fi
+ 
+ 
+-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dovecot-config in \"$dovecotdir\"" >&5
+-$as_echo_n "checking for dovecot-config in \"$dovecotdir\"... " >&6; }
+-      if test -f "$dovecotdir/dovecot-config"; then
+-              { $as_echo "$as_me:${as_lineno-$LINENO}: result: $dovecotdir/dovecot-config" >&5
+-$as_echo "$dovecotdir/dovecot-config" >&6; }
++      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dovecot-devel in \"$dovecotdir\"" >&5
++$as_echo_n "checking for dovecot-devel in \"$dovecotdir\"... " >&6; }
++      if test -f "$dovecotdir/../dovecot-devel"; then
++              { $as_echo "$as_me:${as_lineno-$LINENO}: result: $dovecotdir/../dovecot-devel" >&5
++$as_echo "$dovecotdir/../dovecot-devel" >&6; }
+       else
+               { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+ $as_echo "not found" >&6; }
+               { $as_echo "$as_me:${as_lineno-$LINENO}: " >&5
+ $as_echo "$as_me: " >&6;}
+-              { $as_echo "$as_me:${as_lineno-$LINENO}: Use --with-dovecot=DIR to provide the path to the dovecot-config file." >&5
+-$as_echo "$as_me: Use --with-dovecot=DIR to provide the path to the dovecot-config file." >&6;}
+-              as_fn_error $? "dovecot-config not found" "$LINENO" 5
++              { $as_echo "$as_me:${as_lineno-$LINENO}: Use --with-dovecot=DIR to provide the path to the dovecot-devel file." >&5
++$as_echo "$as_me: Use --with-dovecot=DIR to provide the path to the dovecot-devel file." >&6;}
++              as_fn_error $? "dovecot-devel not found" "$LINENO" 5
+       fi
+ 
+       old=`pwd`
+@@ -11406,8 +11406,8 @@
+       cd $old
+       DISTCHECK_CONFIGURE_FLAGS="--with-dovecot=$abs_dovecotdir --without-dovecot-install-dirs"
+ 
+-      eval `grep -i '^dovecot_[a-z_]*=' "$dovecotdir"/dovecot-config`
+-      eval `grep '^LIBDOVECOT[A-Z_]*=' "$dovecotdir"/dovecot-config`
++      eval `grep -i '^dovecot_[a-z_]*=' "$dovecotdir"/../dovecot-devel`
++      eval `grep '^LIBDOVECOT[A-Z_]*=' "$dovecotdir"/../dovecot-devel`
+ 
+       if test "$use_install_dirs" = "no"; then
+               dovecot_pkgincludedir='$(pkgincludedir)'

diff --git a/dovecot-pigeonhole.spec b/dovecot-pigeonhole.spec
new file mode 100644 (file)
index 0000000..9bc3033
--- /dev/null
+++ b/dovecot-pigeonhole.spec
@@ -0,0 +1,122 @@
+# 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.1
+%define        pigeonhole_version      0.3.4
+Summary:       Sieve plugin for dovecot
+Summary(pl.UTF-8):     Wtyczka Sieve i Managesieve dla dovecota
+Name:          dovecot-pigeonhole
+Version:       %{dovecot_series}_%{pigeonhole_version}
+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: dc553f5979f24a5a6c1c16b952b6d45b
+Patch0:                %{name}-config.patch
+URL:           http://www.dovecot.org/
+BuildRequires: autoconf
+BuildRequires: automake
+BuildRequires: bison
+BuildRequires: dovecot-devel >= 1:2.1
+BuildRequires: flex
+BuildRequires: libtool
+%requires_eq_to        dovecot dovecot-devel
+BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+
+%define skip_post_check_so     libdovecot-sieve.so.0.0.0
+
+%description
+Dovecot Pigeonhole is implementation of Sieve for Dovecot v2.x
+
+%description -l pl.UTF-8
+Dovecot Pigeonhole jest implementacją Sieve dla Dovecot v2.x
+
+%package devel
+Summary:       Libraries and headers for %{name}
+Summary(pl.UTF-8):     Pliki nagłówkowe dla %{name}
+Group:         Development/Libraries
+Requires:      %{name} = %{epoch}:%{version}-%{release}
+
+%description devel
+This package contains development files for linking against %{name}.
+
+%description devel -l pl.UTF-8
+Ten pakiet zawiera pliki rozwoju łączenia %{name}.
+
+%package -n dovecot-managesieve
+Summary:       Manage Sieve daemon for dovecot
+Summary(pl.UTF-8):     Manage Sieve demon dla dovecot
+Group:         Daemons
+
+%description -n dovecot-managesieve
+%description -n dovecot-managesieve -l pl.UTF-8
+Tn pakiet zawiera demona Manage Sieve dla dovecot.
+
+%prep
+%setup -q -n dovecot-%{dovecot_series}-pigeonhole-%{pigeonhole_version}
+%patch0 -p1
+
+%build
+%configure \
+       --with-dovecot=%{_libdir}/dovecot \
+       --with-managesieve=yes \
+       --enable-header-install=yes \
+       --prefix=%{_libdir}/dovecot
+
+%{__make}
+
+%install
+rm -rf $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}/sievec
+%attr(755,root,root) %{_bindir}/sieve-dump
+%attr(755,root,root) %{_libdir}/dovecot/plugins/lib90_sieve_plugin.so
+%attr(755,root,root) %{_libdir}/dovecot/libdovecot-sieve.so*
+
+# ??? - why is this in this package?
+%attr(755,root,root) %{_libdir}/libdovecot.so.0
+
+%{_mandir}/man1/sieve-test.1*
+%{_mandir}/man1/sievec.1*
+%{_mandir}/man1/sieved.1*
+%{_mandir}/man1/sieve-dump.1*
+%{_mandir}/man7/pigeonhole.7*
+
+%files devel
+%defattr(644,root,root,755)
+%dir %{_includedir}/dovecot/sieve
+%{_includedir}/dovecot/sieve/*.h
+
+%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