packages: dovecot-pigeonhole/dovecot-pigeonhole.spec, dovecot-pigeonhole/do...

[skibi]

Author: skibi                        Date: Thu Oct 14 06:42:48 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- Add symlinks libdovecot-login.so.0,libdovecot.so.0  to libdir    

---- Files affected:
packages/dovecot-pigeonhole:
   dovecot-pigeonhole.spec (1.2 -> 1.3) , dovecot-pigeonhole-config.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/dovecot-pigeonhole/dovecot-pigeonhole.spec
diff -u packages/dovecot-pigeonhole/dovecot-pigeonhole.spec:1.2 packages/dovecot-pigeonhole/dovecot-pigeonhole.spec:1.3
--- packages/dovecot-pigeonhole/dovecot-pigeonhole.spec:1.2	Wed Oct 13 21:22:03 2010
+++ packages/dovecot-pigeonhole/dovecot-pigeonhole.spec	Thu Oct 14 08:42:43 2010
@@ -8,7 +8,7 @@
 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
@@ -60,7 +60,7 @@
 %build
 
 %configure \
-		--with-dovecot=%{_libdir} \
+		--with-dovecot=%{_libdir}/dovecot \
 		--with-managesieve=yes \
 		--enable-header-install=yes \
 		--prefix=%{_libdir}/dovecot
@@ -76,7 +76,8 @@
 #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
@@ -92,6 +93,8 @@
 %{_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*
@@ -107,6 +110,11 @@
 
 %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
@@ -121,6 +129,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3  2010/10/14 06:42:43  skibi
+- Add symlinks libdovecot-login.so.0,libdovecot.so.0  to libdir
+
 Revision 1.2  2010/10/13 19:22:03  skibi
 - Fixed file paths. Built with skip_post_check_so
 

================================================================
Index: packages/dovecot-pigeonhole/dovecot-pigeonhole-config.patch
diff -u packages/dovecot-pigeonhole/dovecot-pigeonhole-config.patch:1.1 packages/dovecot-pigeonhole/dovecot-pigeonhole-config.patch:1.2
--- packages/dovecot-pigeonhole/dovecot-pigeonhole-config.patch:1.1	Wed Oct 13 14:53:09 2010
+++ packages/dovecot-pigeonhole/dovecot-pigeonhole-config.patch	Thu Oct 14 08:42:43 2010
@@ -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 @@
 -$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 @@
  
 -	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)'
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/dovecot-pigeonhole/dovecot-pigeonhole.spec?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/dovecot-pigeonhole/dovecot-pigeonhole-config.patch?r1=1.1&r2=1.2&f=u