From: Marcin Krol Date: Wed, 13 Apr 2016 08:58:54 +0000 (+0000) Subject: - drop config patch, not needed anymore and breaks current builds X-Git-Url: https://git.tld-linux.org/?a=commitdiff_plain;h=f12d4f04fb167708951928ce468be77a1afb151a;p=packages%2Fdovecot-pigeonhole.git - drop config patch, not needed anymore and breaks current builds --- diff --git a/dovecot-pigeonhole-config.patch b/dovecot-pigeonhole-config.patch deleted file mode 100644 index ceca304..0000000 --- a/dovecot-pigeonhole-config.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- dovecot-2.2-pigeonhole-0.4.12/configure 2016-02-06 09:54:27.000000000 +0000 -+++ dovecot-2.2-pigeonhole-0.4.12/configure 2016-03-17 09:40:36.131768000 +0000 -@@ -11731,19 +11731,19 @@ - fi - - -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for \"$dovecotdir/dovecot-config\"" >&5 --$as_echo_n "checking for \"$dovecotdir/dovecot-config\"... " >&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 \"$dovecotdir/dovecot-devel\"" >&5 -+$as_echo_n "checking for \"$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; } - { $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` -@@ -11752,8 +11752,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` - - dovecot_installed_moduledir="$dovecot_moduledir" - diff --git a/dovecot-pigeonhole.spec b/dovecot-pigeonhole.spec index 3c563cf..c13df25 100644 --- a/dovecot-pigeonhole.spec +++ b/dovecot-pigeonhole.spec @@ -10,12 +10,11 @@ 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://pigeonhole.dovecot.org/releases/%{dovecot_series}/dovecot-%{dovecot_series}-pigeonhole-%{pigeonhole_version}.tar.gz # Source0-md5: 5009b133096724aa2cb7fe1056d88125 -Patch0: %{name}-config.patch URL: http://www.dovecot.org/ BuildRequires: autoconf BuildRequires: automake @@ -57,7 +56,6 @@ Tn pakiet zawiera demona Manage Sieve dla dovecot. %prep %setup -q -n dovecot-%{dovecot_series}-pigeonhole-%{pigeonhole_version} -%patch0 -p1 %build %configure \