From 9579118922a344a6803deb4bc3136b0387e52854 Mon Sep 17 00:00:00 2001
From: Mark H Weaver <mhw@netris.org>
Date: Sat, 27 Feb 2016 21:05:45 -0500
Subject: gnu: bitlbee: Update to 3.4.1.

* gnu/packages/patches/bitlbee-configure-doc-fix.patch: Delete file.
* gnu-system.am (dist_patch_DATA): Add it.
* gnu/packages/messaging.scm (bitlbee): Update to 3.4.1.
[source]: Remove patch.
---
 gnu/packages/messaging.scm                           |  7 +++----
 gnu/packages/patches/bitlbee-configure-doc-fix.patch | 15 ---------------
 2 files changed, 3 insertions(+), 19 deletions(-)
 delete mode 100644 gnu/packages/patches/bitlbee-configure-doc-fix.patch

(limited to 'gnu')

diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 23c7a0bbdd..076c4dcdc6 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -101,14 +101,13 @@ keys, no previous conversation is compromised.")
 (define-public bitlbee
   (package
     (name "bitlbee")
-    (version "3.4")
+    (version "3.4.1")
     (source (origin
               (method url-fetch)
-              (uri (string-append "http://get.bitlbee.org/src/bitlbee-"
+              (uri (string-append "https://get.bitlbee.org/src/bitlbee-"
                                   version ".tar.gz"))
               (sha256
-               (base32 "0plx4dryf8i6hz7vghg84z5f6w6rkw1l8ckl4c4wh5zxpd3ddfnf"))
-              (patches (list (search-patch "bitlbee-configure-doc-fix.patch")))))
+               (base32 "1qf0ypa9ba5jvsnpg9slmaran16hcc5fnfzbb1sdch1hjhchn2jh"))))
     (build-system gnu-build-system)
     (native-inputs `(("pkg-config" ,pkg-config)
                      ("check" ,check)))
diff --git a/gnu/packages/patches/bitlbee-configure-doc-fix.patch b/gnu/packages/patches/bitlbee-configure-doc-fix.patch
deleted file mode 100644
index ade0b7f25c..0000000000
--- a/gnu/packages/patches/bitlbee-configure-doc-fix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Fix the check for the prebuilt helpfile when xsltproc is not available.
-
---- bitlbee-3.4/configure.orig	2015-03-25 18:09:10.000000000 -0400
-+++ bitlbee-3.4/configure	2015-05-20 14:51:33.627975970 -0400
-@@ -650,8 +650,8 @@
- 
- if [ "$doc" = "1" ]; then
- 	if [ ! -e doc/user-guide/help.txt ] && \
--	     ! type xmlto > /dev/null 2> /dev/null || \
--	     ! type xsltproc > /dev/null 2> /dev/null
-+	     (! type xmlto > /dev/null 2> /dev/null || \
-+	      ! type xsltproc > /dev/null 2> /dev/null)
- 	then
- 		echo
- 		echo 'WARNING: Building from an unreleased source tree without prebuilt helpfile.'
-- 
cgit v1.2.3