packages: icedtea6/icedtea6.spec -- without_nss bcond

jajcus jajcus at pld-linux.org
Sun Apr 18 16:36:15 CEST 2010


Author: jajcus                       Date: Sun Apr 18 14:36:15 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
-- without_nss bcond

---- Files affected:
packages/icedtea6:
   icedtea6.spec (1.51 -> 1.52) 

---- Diffs:

================================================================
Index: packages/icedtea6/icedtea6.spec
diff -u packages/icedtea6/icedtea6.spec:1.51 packages/icedtea6/icedtea6.spec:1.52
--- packages/icedtea6/icedtea6.spec:1.51	Sun Apr 18 16:31:32 2010
+++ packages/icedtea6/icedtea6.spec	Sun Apr 18 16:36:10 2010
@@ -5,6 +5,7 @@
 
 %bcond_without bootstrap	# don't use gcj, use an installed icedtea6 instead
 %bcond_without plugin		# don't build browser plugin
+%bcond_without nss		# don't use NSS
 
 # class data version seen with file(1) that this jvm is able to load
 %define		_classdataversion 50.0
@@ -54,7 +55,7 @@
 BuildRequires:	libjpeg-devel
 BuildRequires:	libpng-devel
 BuildRequires:	libstdc++-static
-BuildRequires:	nss-devel
+%{?with_nss:BuildRequires:	nss-devel}
 BuildRequires:	rpmbuild(macros) >= 1.364
 BuildRequires:	unzip
 BuildRequires:	xorg-lib-libX11-devel
@@ -411,6 +412,7 @@
 %else
 	--disable-plugin \
 %endif
+	%{!?with_nss:--disable-nss} \
 	--with-xalan2-jar=%{_javadir}/xalan.jar \
 	--with-xalan2-serializer-jar=%{_javadir}/serializer.jar \
 	--with-rhino=%{_javadir}/js.jar
@@ -846,6 +848,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.52  2010/04/18 14:36:10  jajcus
+-- without_nss bcond
+
 Revision 1.51  2010/04/18 14:31:32  jajcus
 - do not include the libjsoundalsa.so library in jre-base
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/icedtea6/icedtea6.spec?r1=1.51&r2=1.52&f=u



More information about the pld-cvs-commit mailing list