summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuuso Alasuutari2007-02-02 12:48:59 +0200
committerJaka Kranjc2007-02-12 21:27:26 +0100
commitd2648621d8ba43bf774ab2c84b0caf07de013fa6 (patch)
treeb884c9ca323a9e3cd312cf6d76b7a45dcfc2363b
parent92f2c29b9fdba46fd96746366dedd2724682f5b2 (diff)
kdepim: sub_depends kdebase SASL when cyrus-sasl enabled (bug #13483)
(cherry picked from commit 5cbd156e711bea52258ae69b429905ceb56a8d8f)
-rwxr-xr-xkde-core/kdepim/DEPENDS7
-rw-r--r--kde-core/kdepim/HISTORY4
2 files changed, 11 insertions, 0 deletions
diff --git a/kde-core/kdepim/DEPENDS b/kde-core/kdepim/DEPENDS
index 7ff14d1a79..5ca8d95103 100755
--- a/kde-core/kdepim/DEPENDS
+++ b/kde-core/kdepim/DEPENDS
@@ -15,6 +15,13 @@ optional_depends cyrus-sasl
'--without-sasl' \
'for SASL authentication support (which may be needed for working with e-mail with SMTP and IMAP -- RECOMMENDED)' &&
+# bug #13483
+. "$GRIMOIRE/is_depends_enabled.function" &&
+if is_depends_enabled $SPELL cyrus-sasl
+then
+ sub_depends kdebase SASL
+fi &&
+
config_query ENCRYPTION \
'Would you like to enable encryption support in KMail?' y
if [ "$ENCRYPTION" == "y" ]; then
diff --git a/kde-core/kdepim/HISTORY b/kde-core/kdepim/HISTORY
index 29447bf7b3..b312eb238a 100644
--- a/kde-core/kdepim/HISTORY
+++ b/kde-core/kdepim/HISTORY
@@ -1,3 +1,7 @@
+2007-02-02 Juuso Alasuutari <iuso@sourcemage.org>
+ * DEPENDS: 'sub_depends kdebase SASL' if cyrus-sasl enabled
+ (bug #13483).
+
2007-01-26 Jaka Kranjc <lynxlynxlynx@sourcemage.org>
* DETAILS: updated spell to 3.5.6