[bitlbee] Update .spec and patches

[Matej Cepl]

commit a9ed831911b76bf356d95a1c319b3ab4d7ba635c
Author: Matěj Cepl <mcepl at redhat.com>
Date:   Sat Dec 4 15:27:40 2010 +0100

    Update .spec and patches

 bitlbee-configure-eclipse.patch |   15 ----
 bitlbee-nss.patch               |  170 ---------------------------------------
 bitlbee.spec                    |   24 ++----
 3 files changed, 8 insertions(+), 201 deletions(-)
---
diff --git a/bitlbee.spec b/bitlbee.spec
index 1c53f05..16cdf05 100644
--- a/bitlbee.spec
+++ b/bitlbee.spec
@@ -1,7 +1,7 @@
 Summary:           IRC to other chat networks gateway
 Name:              bitlbee
-Version:           3.0
-Release:           2%{?dist}
+Version:           3.0.1
+Release:           1%{?dist}
 License:           GPLv2+ and MIT
 Group:             System Environment/Daemons
 URL:               http://www.bitlbee.org/
@@ -11,17 +11,11 @@ Source2:           bitlbee-wrapper.h
 Patch0:            bitlbee-syslibdirs.patch
 Patch1:            bitlbee-installP.patch
 Patch2:            bitlbee-libresolv.patch
-Patch3:            bitlbee-nss.patch
-Patch4:            bitlbee-configure-eclipse.patch
 Requires:          xinetd
 Requires(pre):     shadow-utils
 Requires(preun):   /sbin/service
 BuildRequires:     glib2-devel >= 2.4, libxslt
-%if 0%{?fedora}%{?rhel} < 6
-BuildRequires:     gnutls-devel
-%else
-BuildRequires:     openssl-devel
-%endif
+BuildRequires:     nss-devel
 BuildRoot:         %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -46,10 +40,9 @@ developing programs and plugins which use bitlbee.
 %if 0%{?fedora}%{?rhel} < 6
 %patch2 -p1 -b .libresolv
 %endif
-%patch4 -p1 -b .configureEclipse
-%patch3 -p1 -b .nss
 
 %build
+# Note that we cannot use openssl in Fedora packages ... it breaks GPL
 CFLAGS="$RPM_OPT_FLAGS" ./configure \
         --prefix=%{_prefix} \
         --bindir=%{_sbindir} \
@@ -61,11 +54,7 @@ CFLAGS="$RPM_OPT_FLAGS" ./configure \
         --plugindir=%{_libdir}/%{name} \
         --strip=0 \
         --plugins=1 \
-%if 0%{?fedora}%{?rhel} < 6
-        --ssl=gnutls
-%else
-        --ssl=openssl
-%endif
+        --ssl=nss
 
 make DESTDIR=$RPM_BUILD_ROOT %{?_smp_mflags}
 
@@ -127,6 +116,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
+* Sat Dec 04 2010 Matěj Cepl <mcepl at redhat.com> - 3.0.1-1
+- New upstream release
+
 * Sun Nov 21 2010 Matěj Cepl <mcepl at redhat.com> - 3.0-2
 - Get rid of bad regexp magic, now with pure DESTDIR.