- Add symlinks libdovecot-login.so.0,libdovecot.so.0 to libdir

Changed files:
    dovecot-pigeonhole-config.patch -> 1.2
    dovecot-pigeonhole.spec -> 1.3

diff --git a/dovecot-pigeonhole-config.patch b/dovecot-pigeonhole-config.patch
index 84c9625d7ccf5d157d332b374e65c6a348fdb4bb..664f074b7c554762281f56dbda60d7ef76b26573 100644 (file)
--- a/dovecot-pigeonhole-config.patch
+++ b/dovecot-pigeonhole-config.patch
@@ -1,6 +1,6 @@
 diff -ruN dovecot-2.0-pigeonhole-0.2.1/configure dovecot-2.0-pigeonhole-0.2.1/configure
 --- dovecot-2.0-pigeonhole-0.2.1/configure     2010-09-26 22:55:32.000000000 +0000
-+++ dovecot-2.0-pigeonhole-0.2.1/configure     2010-10-13 11:56:23.728816633 +0000
++++ dovecot-2.0-pigeonhole-0.2.1/configure     2010-10-14 06:36:23.728816633 +0000
 @@ -10535,19 +10535,19 @@
  fi
  
@@ -12,9 +12,9 @@ diff -ruN dovecot-2.0-pigeonhole-0.2.1/configure dovecot-2.0-pigeonhole-0.2.1/co
 -$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; }
++      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; }
@@ -35,8 +35,8 @@ diff -ruN dovecot-2.0-pigeonhole-0.2.1/configure dovecot-2.0-pigeonhole-0.2.1/co
  
 -      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`
++      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
index d35b468a89ea5c5930423fdef7b7a0017f42becd..58994a6e520de33fb08b554099db81cb246d702f 100644 (file)
--- a/dovecot-pigeonhole.spec
+++ b/dovecot-pigeonhole.spec
@@ -7,7 +7,7 @@ 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
+Release:       2
 License:       LGPL
 Group:         Daemons
 Source0:       http://www.rename-it.nl/dovecot/%{dovecot_series}/dovecot-%{dovecot_series}-pigeonhole-%{pigeonhole_version}.tar.gz
@@ -59,7 +59,7 @@ This package provides the Manage Sieve daemon for dovecot.
 %build
 
 %configure \
-               --with-dovecot=%{_libdir} \
+               --with-dovecot=%{_libdir}/dovecot \
                --with-managesieve=yes \
                --enable-header-install=yes \
                --prefix=%{_libdir}/dovecot
@@ -75,7 +75,8 @@ rm -rf $RPM_BUILD_ROOT
 #remove the libtool archives
 find $RPM_BUILD_ROOT%{_libdir}/dovecot/ -name '*.la' | xargs rm -f
 find $RPM_BUILD_ROOT%{_libdir}/dovecot/ -name '*.a' | xargs rm -f
-
+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 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -91,6 +92,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/dovecot/plugins/lib90_sieve_plugin.so
 %attr(755,root,root) %{_libdir}/dovecot/libdovecot-sieve.so*
 
+%{_libdir}/libdovecot.so.0
+
 %{_mandir}/man1/sieve-test.1*
 %{_mandir}/man1/sievec.1*
 %{_mandir}/man1/sieved.1*
@@ -106,6 +109,11 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n dovecot-managesieve
 %defattr(644,root,root,755)
+%attr(755,root,root) %{_libexecdir}/dovecot/managesieve
+%attr(755,root,root) %{_libexecdir}/dovecot/managesieve-login
+
+%{_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