[bitlbee] New upstream release.

Sun Jul 24 20:19:35 UTC 2011

commit db769d532d3a85cf9d7c3be7aebcfcc141e0477c
Author: Matěj Cepl <mcepl at redhat.com>
Date:   Sun Jul 24 22:18:58 2011 +0200

    New upstream release.
    
    Updating patches to the latest release.

 .gitignore                   |    1 +
 bitlbee-des3-implement.patch |   16 +++--
 bitlbee-installP.patch       |   33 ++++------
 bitlbee-syslibdirs.patch     |    9 ++-
 bitlbee-systemd.patch        |  134 ------------------------------------------
 bitlbee.spec                 |   17 ++---
 sources                      |    2 +-
 7 files changed, 36 insertions(+), 176 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index f267a3b..646f795 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ bitlbee-1.2.8.tar.gz
 bitlbee-3.0.tar.gz
 /bitlbee-3.0.1.tar.gz
 /bitlbee-3.0.2.tar.gz
+/bitlbee-3.0.3.tar.gz
diff --git a/bitlbee-des3-implement.patch b/bitlbee-des3-implement.patch
index e6a454c..08ee7f1 100644
--- a/bitlbee-des3-implement.patch
+++ b/bitlbee-des3-implement.patch
@@ -1,7 +1,8 @@
-diff -up bitlbee-3.0.1/configure.des3 bitlbee-3.0.1/configure
---- bitlbee-3.0.1/configure.des3	2010-12-28 16:07:35.074260735 +0100
-+++ bitlbee-3.0.1/configure	2010-12-28 16:07:35.082260713 +0100
-@@ -429,10 +431,10 @@ if [ "$ret" = "0" ]; then
+Index: bitlbee-3.0.3/configure
+===================================================================
+--- bitlbee-3.0.3.orig/configure
++++ bitlbee-3.0.3/configure
+@@ -433,10 +433,10 @@ if [ "$ret" = "0" ]; then
  	exit 1
  fi;
  
@@ -15,9 +16,10 @@ diff -up bitlbee-3.0.1/configure.des3 bitlbee-3.0.1/configure
  	# SSL modules anyway, this is mostly unnecessary.)
  	echo 'DES=des.o' >> Makefile.settings
  fi
-diff -up bitlbee-3.0.1/lib/ssl_nss.c.des3 bitlbee-3.0.1/lib/ssl_nss.c
---- bitlbee-3.0.1/lib/ssl_nss.c.des3	2010-12-28 16:07:35.077260726 +0100
-+++ bitlbee-3.0.1/lib/ssl_nss.c	2010-12-28 16:09:02.408014610 +0100
+Index: bitlbee-3.0.3/lib/ssl_nss.c
+===================================================================
+--- bitlbee-3.0.3.orig/lib/ssl_nss.c
++++ bitlbee-3.0.3/lib/ssl_nss.c
 @@ -39,6 +39,7 @@
  #include <seccomon.h>
  #include <secerr.h>
diff --git a/bitlbee-installP.patch b/bitlbee-installP.patch
index 9799ef2..b1c0ed9 100644
--- a/bitlbee-installP.patch
+++ b/bitlbee-installP.patch
@@ -1,7 +1,8 @@
-diff -up bitlbee-3.0/configure.installP bitlbee-3.0/configure
---- bitlbee-3.0/configure.installP	2010-11-22 03:06:31.000000000 +0100
-+++ bitlbee-3.0/configure	2010-11-22 03:05:59.000000000 +0100
-@@ -123,6 +123,8 @@ TARGET=$target
+Index: bitlbee-3.0.3/configure
+===================================================================
+--- bitlbee-3.0.3.orig/configure
++++ bitlbee-3.0.3/configure
+@@ -125,6 +125,8 @@ TARGET=$target
  ARCH=$arch
  CPU=$cpu
  
@@ -10,9 +11,10 @@ diff -up bitlbee-3.0/configure.installP bitlbee-3.0/configure
  DESTDIR=
  LFLAGS=
  EFLAGS=
-diff -up bitlbee-3.0/doc/Makefile.installP bitlbee-3.0/doc/Makefile
---- bitlbee-3.0/doc/Makefile.installP	2010-11-22 03:11:47.000000000 +0100
-+++ bitlbee-3.0/doc/Makefile	2010-11-22 03:13:42.000000000 +0100
+Index: bitlbee-3.0.3/doc/Makefile
+===================================================================
+--- bitlbee-3.0.3.orig/doc/Makefile
++++ bitlbee-3.0.3/doc/Makefile
 @@ -9,8 +9,8 @@ all:
  
  install:
@@ -24,9 +26,10 @@ diff -up bitlbee-3.0/doc/Makefile.installP bitlbee-3.0/doc/Makefile
  	$(MAKE) -C user-guide $@
  
  uninstall:
-diff -up bitlbee-3.0/doc/user-guide/Makefile.installP bitlbee-3.0/doc/user-guide/Makefile
---- bitlbee-3.0/doc/user-guide/Makefile.installP	2010-11-22 03:11:47.000000000 +0100
-+++ bitlbee-3.0/doc/user-guide/Makefile	2010-11-22 03:13:56.000000000 +0100
+Index: bitlbee-3.0.3/doc/user-guide/Makefile
+===================================================================
+--- bitlbee-3.0.3.orig/doc/user-guide/Makefile
++++ bitlbee-3.0.3/doc/user-guide/Makefile
 @@ -41,7 +41,7 @@ install:
  	mkdir -p $(DESTDIR)$(DATADIR)
  	chmod 0755 $(DESTDIR)$(DATADIR)
@@ -36,13 +39,3 @@ diff -up bitlbee-3.0/doc/user-guide/Makefile.installP bitlbee-3.0/doc/user-guide
  
  uninstall:
  	rm -f $(DESTDIR)$(DATADIR)/help.txt
-diff -up bitlbee-3.0/lib/Makefile.installP bitlbee-3.0/lib/Makefile
-diff -up bitlbee-3.0/Makefile.installP bitlbee-3.0/Makefile
-diff -up bitlbee-3.0/protocols/jabber/Makefile.installP bitlbee-3.0/protocols/jabber/Makefile
-diff -up bitlbee-3.0/protocols/Makefile.installP bitlbee-3.0/protocols/Makefile
-diff -up bitlbee-3.0/protocols/msn/Makefile.installP bitlbee-3.0/protocols/msn/Makefile
-diff -up bitlbee-3.0/protocols/oscar/Makefile.installP bitlbee-3.0/protocols/oscar/Makefile
-diff -up bitlbee-3.0/protocols/purple/Makefile.installP bitlbee-3.0/protocols/purple/Makefile
-diff -up bitlbee-3.0/protocols/twitter/Makefile.installP bitlbee-3.0/protocols/twitter/Makefile
-diff -up bitlbee-3.0/protocols/yahoo/Makefile.installP bitlbee-3.0/protocols/yahoo/Makefile
-diff -up bitlbee-3.0/tests/Makefile.installP bitlbee-3.0/tests/Makefile
diff --git a/bitlbee-syslibdirs.patch b/bitlbee-syslibdirs.patch
index d48774f..1cae95f 100644
--- a/bitlbee-syslibdirs.patch
+++ b/bitlbee-syslibdirs.patch
@@ -1,7 +1,8 @@
-diff -up bitlbee-3.0/configure.libresolv bitlbee-3.0/configure
---- bitlbee-3.0/configure.libresolv	2010-10-22 02:51:31.000000000 +0200
-+++ bitlbee-3.0/configure	2010-11-22 01:15:01.000000000 +0100
-@@ -19,7 +19,7 @@ libevent='/usr/'
+Index: bitlbee-3.0.3/configure
+===================================================================
+--- bitlbee-3.0.3.orig/configure
++++ bitlbee-3.0.3/configure
+@@ -20,7 +20,7 @@ libevent='/usr/'
  pidfile='/var/run/bitlbee.pid'
  ipcsocket='/var/run/bitlbee.sock'
  pcdir='$prefix/lib/pkgconfig'
diff --git a/bitlbee.spec b/bitlbee.spec
index 246a4b3..e6f8d9d 100644
--- a/bitlbee.spec
+++ b/bitlbee.spec
@@ -1,6 +1,6 @@
 Summary:           IRC to other chat networks gateway
 Name:              bitlbee
-Version:           3.0.2
+Version:           3.0.3
 Release:           1%{?dist}
 License:           GPLv2+ and MIT
 Group:             System Environment/Daemons
@@ -17,11 +17,9 @@ Patch2:            bitlbee-libresolv.patch
 # Completion of NSS-based SSL implementation. Sent upstream. #714
 # (combined with two tiny fixes from RHBZ #666022)
 Patch4:            bitlbee-des3-implement.patch
-# Yet unaccepted upstream patch from #738, RHBZ #662289
-Patch5:            bitlbee-systemd.patch
 # When the above patches will  be consolidated upstream, this should merge
 # with Patch1 or Patch2 or something like that
-Patch6:            bitlbee-forkdaemon.patch
+Patch5:            bitlbee-forkdaemon.patch
 Requires(pre):     shadow-utils
 Requires(preun):   /sbin/service
 BuildRequires:     glib2-devel >= 2.4, libxslt
@@ -65,15 +63,14 @@ completely stable and not 100% foolproof so use at your own risk.
 
 %prep
 %setup -q
-%patch0 -p1 -b .syslibdir
-%patch1 -p1 -b .installP
+%patch0 -p1
+%patch1 -p1
 %if 0%{?fedora}%{?rhel} < 6
-%patch2 -p1 -b .libresolv
+%patch2 -p1
 %endif
-%patch4 -p1 -b .des3
+%patch4 -p1
 %if 0%{?fedora} >= 15
-%patch5 -p1 -b .systemd
-%patch6 -p1 -b .forkdaemon
+%patch5 -p1
 %endif
 
 %build
diff --git a/sources b/sources
index a0d4951..ef8310a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-214084bd2980047288d2c71c6b5052b7  bitlbee-3.0.2.tar.gz
+4fe688e3a80efe011743f4c9265c0310  bitlbee-3.0.3.tar.gz
