- updated to build with cleaned up dovecot-devel; finished cleanup

Changed files:
    dovecot-sieve.spec -> 1.5

diff --git a/dovecot-sieve.spec b/dovecot-sieve.spec
index 92bf305693c0755bc3864f69def1c7f9c983accf..5a6367f39e9fd020aa0825efffe093703e58d1cf 100644 (file)
--- a/dovecot-sieve.spec
+++ b/dovecot-sieve.spec
@@ -2,21 +2,16 @@ Summary:      Sieve plugin for dovecot
 Summary(pl.UTF-8):     Wtyczka Sieve dla dovecota
 Name:          dovecot-sieve
 Version:       1.0.2
-Release:       2
+Release:       1
 License:       LGPL
 Group:         Daemons
 Source0:       http://dovecot.org/releases/sieve/%{name}-%{version}.tar.gz
-# Source0-md5:  508926fc9ff8e0f6e13506e237d4916b
+# Source0-md5: 508926fc9ff8e0f6e13506e237d4916b
 URL:           http://www.dovecot.org/
-BuildRequires: autoconf
-BuildRequires: automake
-BuildRequires: libtool
-BuildRequires: dovecot-devel
-BuildRequires: flex
 BuildRequires: bison
-BuildRequires: gcc-c++
-BuildRequires: pkgconfig
-Requires:      dovecot
+BuildRequires: dovecot-devel >= 1.0.10-3
+BuildRequires: flex
+%requires_eq_to        dovecot dovecot-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -37,40 +32,29 @@ Ta wtyczka dovecota wywodzi się z serwera Cyrus IMAP w wersji 2.2.12.
 %setup -q
 
 %build
-# crude hack ...
-perl -pi -e's,have_dovecot_libs=no,have_dovecot_libs=yes,g' configure
 %configure \
-       INSTALL_DATA="install -c -p -m644" \
-       --with-dovecot=%{_includedir}/dovecot
-# Replace -I$(dovecot_incdir)/src with -I$(dovecot_incdir)
-# and $(dovecotdir)/src with $(libdir)/dovecot for libraries
-for f in `find . -name Makefile`
-do
-       mv -f $f $f.orig
-       sed -e's/\-I\$(dovecot_incdir)\/src/\-I\$(dovecot_incdir)/g' \
-               -e's/\$(dovecotdir)\/src\(\/lib\/.*\.a\)/\$(libdir)\/dovecot\/plugins\1/g' \
-               < $f.orig > $f
-done
-%{__make}
+       --disable-static \
+       --with-dovecot=%{_libdir}/dovecot-devel
+
+%{__make} \
+       dovecot_incdir=%{_includedir}/dovecot \
+       moduledir=%{_libdir}/dovecot/plugins
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
-       DESTDIR=$RPM_BUILD_ROOT
+       DESTDIR=$RPM_BUILD_ROOT \
+       moduledir=%{_libdir}/dovecot/plugins
 
-# ??? one of two following commands is bogus
-rm -f $RPM_BUILD_ROOT%{_libdir}/dovecot/plugins/lda/*.a
-mkdir $RPM_BUILD_ROOT%{_libdir}/dovecot/plugins
-mv $RPM_BUILD_ROOT%{_libdir}/dovecot/lda $RPM_BUILD_ROOT%{_libdir}/dovecot/plugins
+rm -f $RPM_BUILD_ROOT%{_libdir}/dovecot/plugins/lda/*.la
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libexecdir}/dovecot/sievec
-%attr(755,root,root) %{_libexecdir}/dovecot/sieved
-%attr(755,root,root) %{_libdir}/dovecot/plugins/lda/*.so
-# !needed?
-%{_libdir}/dovecot/plugins/lda/*.la
+%doc AUTHORS ChangeLog NEWS 
+%attr(755,root,root) %{_libdir}/dovecot/sievec
+%attr(755,root,root) %{_libdir}/dovecot/sieved
+%attr(755,root,root) %{_libdir}/dovecot/plugins/lda/lib90_cmusieve_plugin.so