[bitlbee] rediff installP.patch and des3-implement.patch, drop 871_870.diff (merged)

[Adam Williamson]

commit e77b68622a74acbee7790a6cd76c377c072378a4
Author: Adam Williamson <awilliam at redhat.com>
Date:   Sat Mar 31 18:44:14 2012 -0700

    rediff installP.patch and des3-implement.patch, drop 871_870.diff (merged)

 871_870.diff                                       |   22 ----------
 ...ent.patch => bitlbee-3.0.5-des3-implement.patch |    6 +-
 bitlbee-3.0.5-installP.patch                       |   24 +++++++++++
 bitlbee-installP.patch                             |   41 --------------------
 bitlbee.spec                                       |   10 +---
 5 files changed, 30 insertions(+), 73 deletions(-)
---
diff --git a/bitlbee-des3-implement.patch b/bitlbee-3.0.5-des3-implement.patch
similarity index 95%
rename from bitlbee-des3-implement.patch
rename to bitlbee-3.0.5-des3-implement.patch
index 08ee7f1..527a89e 100644
--- a/bitlbee-des3-implement.patch
+++ b/bitlbee-3.0.5-des3-implement.patch
@@ -28,9 +28,9 @@ Index: bitlbee-3.0.3/lib/ssl_nss.c
  
  int ssl_errno = 0;
  
-@@ -238,3 +239,91 @@ b_input_condition ssl_getdirection( void
- 	/* Just in case someone calls us, let's return the most likely case: */
- 	return B_EV_IO_READ;
+@@ -255,3 +255,91 @@
+ {
+ 	return g_strdup( "SSL certificate verification not supported by BitlBee NSS code." );
  }
 +
 +size_t ssl_des3_encrypt(const unsigned char *key, size_t key_len,
diff --git a/bitlbee-3.0.5-installP.patch b/bitlbee-3.0.5-installP.patch
new file mode 100644
index 0000000..87f83dc
--- /dev/null
+++ b/bitlbee-3.0.5-installP.patch
@@ -0,0 +1,24 @@
+--- bitlbee-3.0.5/doc/Makefile	2012-02-18 02:55:09.000000000 -0800
++++ bitlbee-3.0.5/doc/Makefile.new	2012-03-31 18:36:06.112532459 -0700
+@@ -9,8 +9,8 @@
+ 
+ install:
+ 	mkdir -p $(DESTDIR)$(MANDIR)/man8/ $(DESTDIR)$(MANDIR)/man5/
+-	install -m 0644 $(_SRCDIR_)bitlbee.8 $(DESTDIR)$(MANDIR)/man8/
+-	install -m 0644 $(_SRCDIR_)bitlbee.conf.5 $(DESTDIR)$(MANDIR)/man5/
++	$(INSTALL) -m 0644 $(_SRCDIR_)bitlbee.8 $(DESTDIR)$(MANDIR)/man8/
++	$(INSTALL) -m 0644 $(_SRCDIR_)bitlbee.conf.5 $(DESTDIR)$(MANDIR)/man5/
+ 	$(MAKE) -C user-guide $@
+ 
+ uninstall:
+--- bitlbee-3.0.5/doc/user-guide/Makefile	2012-02-18 02:55:09.000000000 -0800
++++ bitlbee-3.0.5/doc/user-guide/Makefile.new	2012-03-31 18:36:01.243464879 -0700
+@@ -41,7 +41,7 @@
+ 	mkdir -p $(DESTDIR)$(DATADIR)
+ 	chmod 0755 $(DESTDIR)$(DATADIR)
+ 	rm -f $(DESTDIR)$(DATADIR)/help.txt # Prevent help function from breaking in running sessions
+-	install -m 0644 $(_SRCDIR_)help.txt $(DESTDIR)$(DATADIR)/help.txt
++	$(INSTALL) -m 0644 $(_SRCDIR_)help.txt $(DESTDIR)$(DATADIR)/help.txt
+ 
+ uninstall:
+ 	rm -f $(DESTDIR)$(DATADIR)/help.txt
diff --git a/bitlbee.spec b/bitlbee.spec
index 540cb56..2dd3bbb 100644
--- a/bitlbee.spec
+++ b/bitlbee.spec
@@ -11,20 +11,17 @@ Source2:           bitlbee-wrapper.h
 # 64bit directories should go before 32bit ones.
 Patch0:            bitlbee-syslibdirs.patch
 # use install -p instead of plain install ... we should protect time stamps
-Patch1:            bitlbee-installP.patch
+Patch1:            bitlbee-3.0.5-installP.patch
 # support for old glibc (EL-4, EL-5) which doesn't have ns_initparse and its friends
 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
+Patch4:            bitlbee-3.0.5-des3-implement.patch
 # When the above patches will  be consolidated upstream, this should merge
 # with Patch1 or Patch2 or something like that
 Patch5:            bitlbee-forkdaemon.patch
 # Reopened http://bugs.bitlbee.org/bitlbee/ticket/738
 Patch6:            bitlbee-systemd.patch
-# Upstream twitter fix: http://bugs.bitlbee.org/bitlbee/ticket/888
-# http://code.bitlbee.org/lh/bitlbee/diff/871
-Patch7:            871_870.diff
 Requires(pre):     shadow-utils
 Requires(preun):   /sbin/service
 BuildRequires:     glib2-devel >= 2.4, libxslt
@@ -71,12 +68,11 @@ completely stable and not 100% foolproof so use at your own risk.
 %if 0%{?fedora}%{?rhel} < 6
 %patch2 -p1
 %endif
-%patch4 -p1
+#patch4 -p1
 %if 0%{?fedora} >= 15
 %patch5 -p1
 %patch6 -p1
 %endif
-%patch7 -p0
 
 %build
 # Note that we cannot use openssl in Fedora packages ... it breaks GPL