[bitlbee/f16] new release 3.0.4, drop a merged patch, rediff syslibdirs.patch

[Adam Williamson]

commit bdd602bcdf7d58a75436e26ed62366f92e1d22d6
Author: Adam Williamson <awilliam at redhat.com>
Date:   Tue Dec 6 12:05:38 2011 -0800

    new release 3.0.4, drop a merged patch, rediff syslibdirs.patch

 .gitignore               |    1 +
 823_822.diff             |   31 -------------------------------
 bitlbee-syslibdirs.patch |    2 +-
 bitlbee.spec             |   11 ++++++-----
 sources                  |    2 +-
 5 files changed, 9 insertions(+), 38 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 646f795..f1b1dc8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ bitlbee-3.0.tar.gz
 /bitlbee-3.0.1.tar.gz
 /bitlbee-3.0.2.tar.gz
 /bitlbee-3.0.3.tar.gz
+/bitlbee-3.0.4.tar.gz
diff --git a/bitlbee-syslibdirs.patch b/bitlbee-syslibdirs.patch
index 1cae95f..06014eb 100644
--- a/bitlbee-syslibdirs.patch
+++ b/bitlbee-syslibdirs.patch
@@ -4,7 +4,7 @@ Index: bitlbee-3.0.3/configure
 +++ bitlbee-3.0.3/configure
 @@ -20,7 +20,7 @@ libevent='/usr/'
  pidfile='/var/run/bitlbee.pid'
- ipcsocket='/var/run/bitlbee.sock'
+ ipcsocket=''
  pcdir='$prefix/lib/pkgconfig'
 -systemlibdirs="/lib /lib64 /usr/lib /usr/lib64 /usr/local/lib /usr/local/lib64"
 +systemlibdirs="/lib64 /usr/lib64 /usr/local/lib64 /lib /usr/lib /usr/local/lib"
diff --git a/bitlbee.spec b/bitlbee.spec
index ff77215..5ec3cc1 100644
--- a/bitlbee.spec
+++ b/bitlbee.spec
@@ -1,7 +1,7 @@
 Summary:           IRC to other chat networks gateway
 Name:              bitlbee
-Version:           3.0.3
-Release:           6%{?dist}
+Version:           3.0.4
+Release:           1%{?dist}
 License:           GPLv2+ and MIT
 Group:             System Environment/Daemons
 URL:               http://www.bitlbee.org/
@@ -22,8 +22,6 @@ Patch4:            bitlbee-des3-implement.patch
 Patch5:            bitlbee-forkdaemon.patch
 # Reopened http://bugs.bitlbee.org/bitlbee/ticket/738
 Patch6:            bitlbee-systemd.patch
-# Fix MSN login - upstream bug #850, rev #823
-Patch7:            823_822.diff
 Requires(pre):     shadow-utils
 Requires(preun):   /sbin/service
 BuildRequires:     glib2-devel >= 2.4, libxslt
@@ -75,7 +73,6 @@ completely stable and not 100% foolproof so use at your own risk.
 %patch5 -p1
 %patch6 -p1
 %endif
-%patch7 -p0
 
 %build
 # Note that we cannot use openssl in Fedora packages ... it breaks GPL
@@ -196,6 +193,10 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Tue Dec 06 2011 Adam Williamson <awilliam at redhat.com> - 3.0.4-1
+- new upstream release 3.0.4
+- drop 823_822.diff (merged upstream obviously)
+
 * Fri Nov 11 2011 Adam Williamson <awilliam at redhat.com> - 3.0.3-6
 - 823_822.diff: fix MSN login (upstream rev #823)
 
diff --git a/sources b/sources
index ef8310a..5a61f7f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4fe688e3a80efe011743f4c9265c0310  bitlbee-3.0.3.tar.gz
+3eb1e3e30c015885c641503eec4b05cb  bitlbee-3.0.4.tar.gz