rpms/gaim/devel gaim.spec,1.116,1.117

[fedora-cvs-commits at redhat.com]

Author: wtogami

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

Modified Files:
	gaim.spec 
Log Message:
184: silc crash fix (#190152)



Index: gaim.spec
===================================================================
RCS file: /cvs/dist/rpms/gaim/devel/gaim.spec,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- gaim.spec	9 Apr 2006 01:00:46 -0000	1.116
+++ gaim.spec	28 Apr 2006 22:19:42 -0000	1.117
@@ -10,10 +10,12 @@
 %define evolution_integration	1
 # OPTION: SILC integration (FC3+)
 %define silc_integration	1
+# OPTION: Standalone NSS (FC5+)
+%define standalone_nss		1
 
 Name:		gaim
 Version:	1.5.0
-Release:        16.fc6
+Release:        17.fc6
 Epoch:		1
 License:	GPL
 Group:		Applications/Internet
@@ -70,6 +72,7 @@
 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
+Patch184: gaim-1.5.0-silc-CID-71.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 Summary:	A Gtk+ based multiprotocol instant messaging client
@@ -160,9 +163,12 @@
 %patch178 -p0
 %patch179 -p0
 %patch180 -p2
+%if %{standalone_nss}
 %patch181 -p1
+%endif
 %patch182 -p0
 %patch183 -p2
+%patch184 -p2
 
 # Relabel internal version for support purposes
 sed -i "s/%{version}/%{version}-%{release}/g" configure
@@ -277,31 +283,19 @@
 %endif
 
 %changelog
+* Fri Apr 28 2006 Warren Togami <wtogami at redhat.com> - 1:1.5.0-17
+- 184: silc crash fix (#190152)
+
 * 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)