From ead9c008f00c98d1755ea26c1c474c3017eda7b2 Mon Sep 17 00:00:00 2001 From: Matěj Cepl Date: Nov 21 2010 21:19:33 +0000 Subject: Some cleans up for using NSS: --- diff --git a/bitlbee.spec b/bitlbee.spec index 1b46be6..a0dabd4 100644 --- a/bitlbee.spec +++ b/bitlbee.spec @@ -1,22 +1,21 @@ Summary: IRC to other chat networks gateway Name: bitlbee Version: 3.0 -Release: 1%{?dist} +Release: 1.nss.1%{?dist} License: GPLv2+ and MIT Group: System Environment/Daemons URL: http://www.bitlbee.org/ Source0: http://get.bitlbee.org/src/%{name}-%{version}.tar.gz Source1: bitlbee.xinetd Source2: bitlbee-wrapper.h +Patch0: bitlbee-1.2.8-strtoll.patch +Patch1: bitlbee-3.0-nss.patch +Patch2: bitlbee-3.0-configure-eclipse.patch Requires: xinetd Requires(pre): shadow-utils Requires(preun): /sbin/service BuildRequires: glib2-devel >= 2.4, libxslt -%if 0%{?fedora}%{?rhel} -BuildRequires: gnutls-devel -%else -BuildRequires: openssl-devel -%endif +BuildRequires: nss-devel BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -36,6 +35,8 @@ developing programs and plugins which use bitlbee. %prep %setup -q +%patch1 -p1 -b .nss +%patch2 -p1 -b .configureEclipse perl -pi.make -e ' s|\$\(BINDIR\)|\$(sbindir)|g; @@ -59,11 +60,7 @@ CFLAGS="$RPM_OPT_FLAGS" ./configure \ --plugindir=%{_libdir}/%{name} \ --strip=0 \ --plugins=1 \ -%if 0%{?fedora}%{?rhel} - --ssl=gnutls -%else - --ssl=openssl -%endif + --ssl=nss make %{?_smp_mflags}