[packages/icedtea7: 16/103] - build plugin… strange, it seems to work now (configure at least)

jajcus jajcus at pld-linux.org
Fri Apr 19 13:09:10 CEST 2013


commit 9461a5c586b103d36fc58baea94eba86c0939dbb
Author: Jacek Konieczny <jajcus at pld-linux.org>
Date:   Thu Apr 15 12:52:04 2010 +0000

    - build plugin… strange, it seems to work now (configure at least)
    
    Changed files:
        icedtea6.spec -> 1.16

 icedtea6.spec | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)
---
diff --git a/icedtea6.spec b/icedtea6.spec
index 81a7e30..1212640 100644
--- a/icedtea6.spec
+++ b/icedtea6.spec
@@ -1,6 +1,7 @@
 #
 %bcond_without bootstrap	# don't use gcj, use an installed icedtea6
 				# instead
+%bcond_without plugin		# don't build browser plugin
 #
 # class data version seen with file(1) that this jvm is able to load
 %define		_classdataversion 50.0
@@ -55,7 +56,7 @@ BuildRequires:	xorg-lib-libXt-devel
 BuildRequires:	xorg-lib-libXtst-devel
 BuildRequires:	xorg-proto-printproto-devel
 BuildRequires:	xorg-proto-xproto-devel
-#BuildRequires:	xulrunner-devel
+%{?with_plugin:BuildRequires:	xulrunner-devel}
 BuildRequires:	zip
 BuildRequires:	zlib-devel
 Requires:	%{name}-appletviewer = %{version}-%{release}
@@ -255,10 +256,14 @@ JAVA_HOME=%{_jvmdir}/icedtea6
 %else
 	--with-openjdk=%{_jvmdir}/icedtea6 \
 %endif
+%if %{with plugin}
+	--enable-plugin \
+%else
+	--disable-plugin \
+%endif
 	--with-xalan2-jar=%{_javadir}/xalan.jar \
 	--with-xalan2-serializer-jar=%{_javadir}/serializer.jar \
-	--with-rhino=%{_javadir}/js.jar \
-	--disable-plugin
+	--with-rhino=%{_javadir}/js.jar
 
 %{__make} extract extract-ecj
 
================================================================

---- gitweb:

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



More information about the pld-cvs-commit mailing list