packages: icedtea6/icedtea6.spec - build plugin… s trange, it seems to wor...

[jajcus]

Author: jajcus                       Date: Thu Apr 15 12:52:10 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- build plugin… strange, it seems to work now (configure at least)

---- Files affected:
packages/icedtea6:
   icedtea6.spec (1.15 -> 1.16) 

---- Diffs:

================================================================
Index: packages/icedtea6/icedtea6.spec
diff -u packages/icedtea6/icedtea6.spec:1.15 packages/icedtea6/icedtea6.spec:1.16
--- packages/icedtea6/icedtea6.spec:1.15	Thu Apr 15 14:19:21 2010
+++ packages/icedtea6/icedtea6.spec	Thu Apr 15 14:52:04 2010
@@ -2,6 +2,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
@@ -56,7 +57,7 @@
 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}
@@ -256,10 +257,14 @@
 %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
 
@@ -651,6 +656,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.16  2010/04/15 12:52:04  jajcus
+- build plugin… strange, it seems to work now (configure at least)
+
 Revision 1.15  2010/04/15 12:19:21  jajcus
 - javaws is not installed on x86_64
 
================================================================

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