From 7ae37872c111b72c381fce2744a72ed6a5f401a6 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Sep 25 2013 02:06:55 +0000
Subject: bump to latest upstream bzr as no new build seems to be coming


---

diff --git a/.gitignore b/.gitignore
index a1e8b45..51de556 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 bitlbee-3.?.?.tar.gz
 bitlbee-3.?.tar.gz
+/bitlbee-997.tar.bz2
diff --git a/bitlbee.spec b/bitlbee.spec
index bc5bf03..633164a 100644
--- a/bitlbee.spec
+++ b/bitlbee.spec
@@ -13,11 +13,13 @@
 Summary:           IRC to other chat networks gateway
 Name:              bitlbee
 Version:           3.2
-Release:           6%{?dist}
+Release:           7.20130713bzr997%{?dist}
 License:           GPLv2+ and MIT
 Group:             System Environment/Daemons
 URL:               http://www.bitlbee.org/
-Source0:           http://get.bitlbee.org/src/%{name}-%{version}.tar.gz
+# bzr export -r 997 --root=bitlbee-3.2 bitlbee-997.tar.bz2 http://code.bitlbee.org/bitlbee/
+Source0:           bitlbee-997.tar.bz2
+#Source0:           http://get.bitlbee.org/src/%{name}-%{version}.tar.gz
 Source1:           bitlbee.xinetd
 Source2:           bitlbee-wrapper.h
 # Always use 'install -p' instead of plain install to protect time stamps
@@ -42,9 +44,6 @@ Patch5:            bitlbee-3.2-libotr4.patch
 # aka http://bugs.bitlbee.org/bitlbee/ticket/1008
 # Open socket on IPv6 as well
 Patch6:            bitlbee-IPv6.patch
-# Suggested fix for https://bugzilla.redhat.com/922447 aka
-# http://bugs.bitlbee.org/bitlbee/ticket/1038
-Patch7:            nss-crash-rhbz922447.patch
 
 
 Requires(pre):     shadow-utils
@@ -63,6 +62,8 @@ Requires:          xinetd
 %endif
 %if %{with otr}
 BuildRequires:     libotr-devel >= 3.2.0
+# Only needed for bzr builds - adamw 2013/09
+BuildRequires:     xmlto
 %endif
 BuildRoot:         %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -113,7 +114,13 @@ echo With systemd %with_systemd
 %patch5 -p1
 %endif
 
-%patch7 -p1
+# there's an annoying check which tries to only build the docs if
+# building a bzr checkout...just by testing for .bzr. So you can
+# either build from a 'clean' tarball (without all the .bzr stuff)
+# but hack out that check, or build from a 'dirty' tarball but
+# leave the check intact. Let's hack out the check. Obviously this
+# is not needed for stable builds. -adamw 2013/09
+sed -i -e 's/test ! -d ..\/.bzr ||//' doc/Makefile
 
 
 %build
@@ -247,6 +254,10 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Tue Sep 24 2013 Adam Williamson <awilliam@redhat.com> -3.2-7.20130713bzr997
+- let's just go to latest upstream bzr, since there's no new release
+- drop nss-crash-rhbz922447.patch, merged upstream as rev 987
+
 * Fri Aug 16 2013 Matěj Cepl <mcepl@redhat.com> - 3.2-6
 - systemd socket should be opened over IPv6 as well (#949303)
 - return fix for NSS crash (#922447)
diff --git a/sources b/sources
index 18b9b41..5264fd9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6a8fe98e96a47c636004a245075d5d7c  bitlbee-3.2.tar.gz
+d0035761ec0c4b0f9307cdb019c62cbe  bitlbee-997.tar.bz2