[packages/icedtea7: 60/103] -- without_nss bcond

jajcus jajcus at pld-linux.org
Fri Apr 19 13:12:51 CEST 2013


commit 5785f56fdcea07307baea04688884fff402f99a1
Author: Jacek Konieczny <jajcus at pld-linux.org>
Date:   Sun Apr 18 14:36:10 2010 +0000

    -- without_nss bcond
    
    Changed files:
        icedtea6.spec -> 1.52

 icedtea6.spec | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
---
diff --git a/icedtea6.spec b/icedtea6.spec
index 317c15f..6db609f 100644
--- a/icedtea6.spec
+++ b/icedtea6.spec
@@ -4,6 +4,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
@@ -53,7 +54,7 @@ BuildRequires:	libffi-devel
 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
@@ -410,6 +411,7 @@ export PATH="$JAVA_HOME/bin:$PATH"
 %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
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/icedtea7.git/commitdiff/f360048b2271851d733c2fc755b8e7cae2f337cf



More information about the pld-cvs-commit mailing list