[bitlbee] rediff otr patch, add an extra br needed for f20

Adam Williamson adamwill at fedoraproject.org
Wed Sep 25 02:33:00 UTC 2013


commit 0be1f4f4c0b33ca083b10d6e9e12cd1c07f64799
Author: Adam Williamson <awilliam at redhat.com>
Date:   Tue Sep 24 19:32:27 2013 -0700

    rediff otr patch, add an extra br needed for f20

 bitlbee-3.2-libotr4.patch |    9 +--------
 bitlbee.spec              |    5 ++++-
 2 files changed, 5 insertions(+), 9 deletions(-)
---
diff --git a/bitlbee-3.2-libotr4.patch b/bitlbee-3.2-libotr4.patch
index 4954ad2..32888a1 100644
--- a/bitlbee-3.2-libotr4.patch
+++ b/bitlbee-3.2-libotr4.patch
@@ -1,13 +1,6 @@
 --- a/otr.c
 +++ b/otr.c
-@@ -1,23 +1,25 @@
-   /********************************************************************\
-   * BitlBee -- An IRC to other IM-networks gateway                     *
-   *                                                                    *
--  * Copyright 2002-2010 Wilmer van der Gaast and others                *
-+  * Copyright 2002-2012 Wilmer van der Gaast and others                *
-   \********************************************************************/
- 
+@@ -1,17 +1,19 @@
  /*
    OTR support (cf. http://www.cypherpunks.ca/otr/)
    
diff --git a/bitlbee.spec b/bitlbee.spec
index 633164a..8fa5e0a 100644
--- a/bitlbee.spec
+++ b/bitlbee.spec
@@ -62,9 +62,12 @@ Requires:          xinetd
 %endif
 %if %{with otr}
 BuildRequires:     libotr-devel >= 3.2.0
+%endif
+
 # Only needed for bzr builds - adamw 2013/09
 BuildRequires:     xmlto
-%endif
+BuildRequires:     lynx
+
 BuildRoot:         %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description


More information about the scm-commits mailing list