rpms/gaim/devel gaim.spec,1.109,1.110

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Fri Jan 13 19:05:34 UTC 2006


Author: wtogami

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

Modified Files:
	gaim.spec 
Log Message:
- buildreq desktop-file-utils (ivazquez #176688)
- detect NSS in a generic way and abort on failure



Index: gaim.spec
===================================================================
RCS file: /cvs/dist/rpms/gaim/devel/gaim.spec,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- gaim.spec	21 Dec 2005 13:14:27 -0000	1.109
+++ gaim.spec	13 Jan 2006 19:05:29 -0000	1.110
@@ -13,7 +13,7 @@
 
 Name:		gaim
 Version:	1.5.0
-Release: 9.fc5.3
+Release:        13.fc5
 Epoch:		1
 License:	GPL
 Group:		Applications/Internet
@@ -82,8 +82,9 @@
 # Basic Library Requirements
 BuildRequires:	libao-devel, startup-notification-devel, audiofile-devel
 
-BuildRequires:	nss-devel
+BuildRequires:	mozilla-nss-devel
 BuildRequires:	gtk2-devel
+BuildRequires:  desktop-file-utils
 
 # krb5 needed for Zephyr (FC1+)
 %if %{krb_integration}
@@ -198,6 +199,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}
@@ -268,6 +273,10 @@
 %endif
 
 %changelog
+* 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)
 




More information about the fedora-cvs-commits mailing list