[packages/dovecot-pigeonhole] Build with a fixed dovecot-config

[jajcus]

commit 12ec835867860402bb82a4e234768664887dd1cf
Author: Jacek Konieczny <j.konieczny at eggsoft.pl>
Date:   Mon Dec 9 16:12:56 2013 +0100

    Build with a fixed dovecot-config
    
    Failed attempts, to work-around a bugs in dovecot.spec, dropped.
    
    Release: 2

 dovecot-pigeonhole-config.patch | 42 -----------------------------------------
 dovecot-pigeonhole.spec         | 11 ++---------
 2 files changed, 2 insertions(+), 51 deletions(-)
---
diff --git a/dovecot-pigeonhole.spec b/dovecot-pigeonhole.spec
index 76bf068..2965c50 100644
--- a/dovecot-pigeonhole.spec
+++ b/dovecot-pigeonhole.spec
@@ -2,7 +2,6 @@
 # - 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
@@ -10,17 +9,16 @@ 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
 # Source0-md5:	e8cb4976db9811d37e9d870f2f75ffef
-Patch0:		%{name}-config.patch
 URL:		http://pigeonhole.dovecot.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	bison
-BuildRequires:	dovecot-devel >= 1:%{dovecot_series}
+BuildRequires:	dovecot-devel >= 1:2.2.9-2
 BuildRequires:	flex
 BuildRequires:	libtool
 %requires_eq_to	dovecot dovecot-devel
@@ -57,7 +55,6 @@ Tn pakiet zawiera demona Manage Sieve dla dovecot.
 
 %prep
 %setup -q -n dovecot-%{dovecot_series}-pigeonhole-%{pigeonhole_version}
-%patch0 -p1
 
 %build
 %configure \
@@ -75,10 +72,6 @@ rm -rf $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
diff --git a/dovecot-pigeonhole-config.patch b/dovecot-pigeonhole-config.patch
deleted file mode 100644
index e9c8436..0000000
--- a/dovecot-pigeonhole-config.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-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)'
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/dovecot-pigeonhole.git/commitdiff/12ec835867860402bb82a4e234768664887dd1cf