rpms/gaim/FC-4 gaim.spec,1.92,1.93

[fedora-cvs-commits at redhat.com]

Author: wtogami

Update of /cvs/dist/rpms/gaim/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv30510

Modified Files:
	gaim.spec 
Log Message:
MSN block crash (#185222 Stu Tomlinson)



Index: gaim.spec
===================================================================
RCS file: /cvs/dist/rpms/gaim/FC-4/gaim.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- gaim.spec	11 Nov 2005 15:46:44 -0000	1.92
+++ gaim.spec	9 Apr 2006 01:26:50 -0000	1.93
@@ -13,7 +13,7 @@
 
 Name:		gaim
 Version:	1.5.0
-Release:	9.fc4
+Release:        16.fc4
 Epoch:		1
 License:	GPL
 Group:		Applications/Internet
@@ -67,6 +67,9 @@
 Patch178: gaim-1.5.0-hacking-doc.patch
 Patch179: gaim-1.5.0-doc-creation.patch
 Patch180: gaim-1.5.0-aim-rate-limiting.patch
+Patch181: gaim-1.5.0-nss-detect.patch
+Patch182: gaim-1.5.0-logging-compatibility.patch
+Patch183: gaim-1.5.0-msn-block-crash.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 Summary:	A Gtk+ based multiprotocol instant messaging client
@@ -83,6 +86,7 @@
 
 BuildRequires:	mozilla-nss-devel
 BuildRequires:	gtk2-devel
+BuildRequires:  desktop-file-utils
 
 # krb5 needed for Zephyr (FC1+)
 %if %{krb_integration}
@@ -156,6 +160,9 @@
 %patch178 -p0
 %patch179 -p0
 %patch180 -p2
+%patch181 -p1
+%patch182 -p0
+%patch183 -p2
 
 # Relabel internal version for support purposes
 sed -i "s/%{version}/%{version}-%{release}/g" configure
@@ -196,6 +203,10 @@
 # disable tcl and tk because nobody uses it
 # gnutls is buggy so use mozilla-nss on all distributions
 %configure --disable-tcl --disable-tk --enable-gnutls=no --enable-nss=yes $WITH_KRB $WITH_SILC $WITH_PERL
+
+# Abort build if NSS was not detected
+grep -q "#define HAVE_NSS 1" config.h || exit 1
+
 # patch Makefile for PIE
 patch -p1 < %{PATCH5}
 make %{?_smp_mflags}
@@ -266,6 +277,31 @@
 %endif
 
 %changelog
+* Sat Apr 08 2006 Warren Togami <wtogami at redhat.com> - 1:1.5.0-16
+- MSN block crash (#185222 Stu Tomlinson)
+
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1:1.5.0-15.fc5.1
+- bump again for double-long bug on ppc(64)
+
+* Tue Feb 07 2006 Warren Togami <wtogami at redhat.com> 1:1.5.0-15
+- allow compat with gaim-2.x log format (rlaager)
+
+* Sat Jan 28 2006 David Malcolm <dmalcolm at redhat.com> 1:1.5.0-14
+- rebuild for new e-d-s
+
+* Fri Jan 13 2006 Warren Togami <wtogami at redhat.com> 1:1.5.0-13
+- buildreq desktop-file-utils (ivazquez #176688)
+- detect NSS in a generic way and abort on failure
+
+* Wed Dec 21 2005 Warren Togami <wtogami at redhat.com>
+- rebuild for nss-devel (#176314 nosnilmot)
+
+* Tue Dec 20 2005 Ray Strode <rstrode at redhat.com>
+- rebuilt
+
+* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
+- rebuilt
+
 * Thu Nov 10 2005 Warren Togami <wtogami at redhat.com> - 1:1.5.0-9
 - Ensure that security opt flags are used (#165795)
 - Many bug fixes from Peter Lawler (#171350)