From a43add1d49352b061f84daa1c2724d2d98873147 Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Thu, 17 Mar 2016 09:45:03 +0000 Subject: [PATCH] - updated to 0.4.12 --- dovecot-pigeonhole-config.patch | 21 ++++++++++----------- dovecot-pigeonhole.spec | 4 ++-- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/dovecot-pigeonhole-config.patch b/dovecot-pigeonhole-config.patch index e9c8436..ceca304 100644 --- a/dovecot-pigeonhole-config.patch +++ b/dovecot-pigeonhole-config.patch @@ -1,17 +1,16 @@ -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 @@ +--- 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 dovecot-config in \"$dovecotdir\"" >&5 --$as_echo_n "checking for dovecot-config in \"$dovecotdir\"... " >&6; } +- { $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 dovecot-devel in \"$dovecotdir\"" >&5 -+$as_echo_n "checking for dovecot-devel in \"$dovecotdir\"... " >&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; } @@ -29,7 +28,7 @@ diff -ruN dovecot-2.1-pigeonhole-0.3.1/configure dovecot-2.1-pigeonhole-0.3.1-ne fi old=`pwd` -@@ -11406,8 +11406,8 @@ +@@ -11752,8 +11752,8 @@ cd $old DISTCHECK_CONFIGURE_FLAGS="--with-dovecot=$abs_dovecotdir --without-dovecot-install-dirs" @@ -38,5 +37,5 @@ diff -ruN dovecot-2.1-pigeonhole-0.3.1/configure dovecot-2.1-pigeonhole-0.3.1-ne + 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)' + dovecot_installed_moduledir="$dovecot_moduledir" + diff --git a/dovecot-pigeonhole.spec b/dovecot-pigeonhole.spec index c86b10b..9cadeab 100644 --- a/dovecot-pigeonhole.spec +++ b/dovecot-pigeonhole.spec @@ -5,7 +5,7 @@ # - fix mess with dovecot libraries (symlinks in package that shouldn't be here) %define dovecot_series 2.2 -%define pigeonhole_version 0.4.11 +%define pigeonhole_version 0.4.12 Summary: Sieve plugin for dovecot Summary(pl.UTF-8): Wtyczka Sieve i Managesieve dla dovecota Name: dovecot-pigeonhole @@ -14,7 +14,7 @@ Release: 1 License: LGPL Group: Daemons Source0: http://pigeonhole.dovecot.org/releases/%{dovecot_series}/dovecot-%{dovecot_series}-pigeonhole-%{pigeonhole_version}.tar.gz -# Source0-md5: e48e36501ae48fc48ff47b3a4398a641 +# Source0-md5: eb96e65be62c71f987a3b5ad2d782b7b Patch0: %{name}-config.patch URL: http://www.dovecot.org/ BuildRequires: autoconf -- 2.46.0