Author: qboosh Date: Sat May 19 12:49:41 2007 GMT
Module: SPECS Tag: HEAD
---- Log message:
- mozilla bcond (for libgcjwebplugin)
---- Files affected:
SPECS:
gcc.spec (1.484 -> 1.485)
---- Diffs:
================================================================
Index: SPECS/gcc.spec
diff -u SPECS/gcc.spec:1.484 SPECS/gcc.spec:1.485
--- SPECS/gcc.spec:1.484 Fri May 18 21:33:41 2007
+++ SPECS/gcc.spec Sat May 19 14:49:36 2007
@@ -17,6 +17,7 @@
%bcond_without alsa # don't build libgcj ALSA MIDI interface
%bcond_without dssi # don't build libgcj DSSI MIDI interface
%bcond_without gtk # don't build libgcj GTK peer
+%bcond_without mozilla # don't build libgcjwebplugin
%bcond_without qt # don't build libgcj Qt peer
%bcond_without x # don't build libgcj Xlib-dependent AWTs (incl.
GTK/Qt)
%bcond_with multilib # build with multilib support (it needs
glibc[32&64]-devel)
@@ -140,7 +141,7 @@
BuildRequires: QtGui-devel >= 4.0.1
BuildRequires: qt4-build >= 4.0.1
%endif
-BuildRequires: xulrunner-devel >= 1.8.1.3-1.20070321.5
+%{?with_mozilla:BuildRequires: xulrunner-devel >= 1.8.1.3-1.20070321.5}
%endif
# AS_NEEDED directive for dynamic linker
# http://sources.redhat.com/ml/glibc-cvs/2005-q1/msg00614.html
@@ -895,7 +896,7 @@
%if %{with x}
--enable-java-awt="xlib%{?with_gtk:,gtk}%{?with_qt:,qt}" \
%endif
- --enable-plugin \
+ %{?with_mozilla:--enable-plugin} \
--enable-libgcj \
--enable-libgcj-multifile \
--enable-libgcj-database \
@@ -1403,7 +1404,7 @@
%{?with_x:%attr(755,root,root) %{_libdir}/lib-gnu-awt-xlib.so.*.*.*}
%dir %{_libdir}/gcj-%{version}
%{_libdir}/gcj-%{version}/classmap.db
-%attr(755,root,root) %{_libdir}/gcj-%{version}/libgcjwebplugin.so
+%{?with_mozilla:%attr(755,root,root)
%{_libdir}/gcj-%{version}/libgcjwebplugin.so}
%{?with_alsa:%attr(755,root,root) %{_libdir}/gcj-%{version}/libgjsmalsa.so*}
%{?with_dssi:%attr(755,root,root) %{_libdir}/gcj-%{version}/libgjsmdssi.so*}
%{?with_gtk:%attr(755,root,root) %{_libdir}/gcj-%{version}/libgtkpeer.so}
@@ -1527,6 +1528,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.485 2007/05/19 12:49:36 qboosh
+- mozilla bcond (for libgcjwebplugin)
+
Revision 1.484 2007/05/18 19:33:41 qboosh
- post-snap cleanup (snaps belong to DEVEL branch)
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/gcc.spec?r1=1.484&r2=1.485&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
