Author: qboosh Date: Thu Aug 2 19:29:18 2007 GMT
Module: SPECS Tag: HEAD
---- Log message:
- unified bconds (separate gnomeui/gnomevfs + gnome alias for convenience)
- apply gnome* bconds to file list
---- Files affected:
SPECS:
mozilla-firefox.spec (1.211 -> 1.212)
---- Diffs:
================================================================
Index: SPECS/mozilla-firefox.spec
diff -u SPECS/mozilla-firefox.spec:1.211 SPECS/mozilla-firefox.spec:1.212
--- SPECS/mozilla-firefox.spec:1.211 Wed Aug 1 22:02:05 2007
+++ SPECS/mozilla-firefox.spec Thu Aug 2 21:29:12 2007
@@ -6,10 +6,16 @@
# - make it more pld-like (bookmarks, default page etc..)
#
# Conditional build:
-%bcond_with tests # enable tests (whatever they check)
-%bcond_without gnome # disable all GNOME components (gnomevfs, gnome,
gnomeui)
-%bcond_with tidy # enable htmlvalidator extension (tidy)
+%bcond_with tests # enable tests (whatever they check)
+%bcond_without gnomeui # disable gnomeui support
+%bcond_without gnomevfs # disable GNOME comp. (gconf+libgnome+gnomevfs)
and gnomevfs ext.
+%bcond_without gnome # disable all GNOME components
(gnome+gnomeui+gnomevfs)
+%bcond_with tidy # enable htmlvalidator extension (tidy)
#
+%if %{without gnome}
+%undefine with_gnomeui
+%undefine with_gnomevfs
+%endif
%define tidy_ver 0.8.4.0
%define firefox_ver 2.0.0.6
#
@@ -18,7 +24,7 @@
Name: mozilla-firefox
Version: %{firefox_ver}
Release: 1
-License: MPL/LGPL
+License: MPL 1.1 or GPL v2+ or LGPL v2.1+
Group: X11/Applications/Networking
Source0:
ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/%{version}/source/firefox-%{version}-source.tar.bz2
# Source0-md5: 16fb252fb7b0371894f7101b88fd9076
@@ -36,15 +42,15 @@
# if ac rebuild is needed...
#PatchX: %{name}-ac.patch
URL: http://www.mozilla.org/projects/firefox/
-%{?with_gnome:BuildRequires: GConf2-devel >= 1.2.1}
+%{?with_gnomevfs:BuildRequires: GConf2-devel >= 1.2.1}
BuildRequires: automake
BuildRequires: cairo-devel >= 1.0.0
-%{?with_gnome:BuildRequires: gnome-vfs2-devel >= 2.0}
+%{?with_gnomevfs:BuildRequires: gnome-vfs2-devel >= 2.0}
BuildRequires: gtk+2-devel >= 1:2.0.0
BuildRequires: krb5-devel
BuildRequires: libIDL-devel >= 0.8.0
-%{?with_gnome:BuildRequires: libgnome-devel >= 2.0}
-%{?with_gnome:BuildRequires: libgnomeui-devel >= 2.2.0}
+%{?with_gnomevfs:BuildRequires: libgnome-devel >= 2.0}
+%{?with_gnomeui:BuildRequires: libgnomeui-devel >= 2.2.0}
BuildRequires: libjpeg-devel >= 6b
BuildRequires: libpng-devel >= 1.2.7
BuildRequires: libstdc++-devel
@@ -356,17 +362,17 @@
%attr(755,root,root) %{_libdir}/%{name}/components/libgkplugin.so
%attr(755,root,root) %{_libdir}/%{name}/components/libhtmlpars.so
%attr(755,root,root) %{_libdir}/%{name}/components/libi18n.so
-%attr(755,root,root) %{_libdir}/%{name}/components/libimgicon.so
+%{?with_gnomeui:%attr(755,root,root)
%{_libdir}/%{name}/components/libimgicon.so}
%attr(755,root,root) %{_libdir}/%{name}/components/libimglib2.so
%attr(755,root,root) %{_libdir}/%{name}/components/libjar50.so
%attr(755,root,root) %{_libdir}/%{name}/components/libjsd.so
%attr(755,root,root) %{_libdir}/%{name}/components/libmork.so
%attr(755,root,root) %{_libdir}/%{name}/components/libmozfind.so
-%attr(755,root,root) %{_libdir}/%{name}/components/libmozgnome.so
+%{?with_gnomevfs:%attr(755,root,root)
%{_libdir}/%{name}/components/libmozgnome.so}
%attr(755,root,root) %{_libdir}/%{name}/components/libmyspell.so
%attr(755,root,root) %{_libdir}/%{name}/components/libnecko2.so
%attr(755,root,root) %{_libdir}/%{name}/components/libnecko.so
-%attr(755,root,root) %{_libdir}/%{name}/components/libnkgnomevfs.so
+%{?with_gnomevfs:%attr(755,root,root)
%{_libdir}/%{name}/components/libnkgnomevfs.so}
%attr(755,root,root) %{_libdir}/%{name}/components/libnsappshell.so
%attr(755,root,root) %{_libdir}/%{name}/components/liboji.so
%attr(755,root,root) %{_libdir}/%{name}/components/libpermissions.so
@@ -453,7 +459,7 @@
%{_libdir}/%{name}/components/gksvgrenderer.xpt
%{_libdir}/%{name}/components/history.xpt
%{_libdir}/%{name}/components/htmlparser.xpt
-%{_libdir}/%{name}/components/imgicon.xpt
+%{?with_gnomeui:%{_libdir}/%{name}/components/imgicon.xpt}
%{_libdir}/%{name}/components/imglib2.xpt
%{_libdir}/%{name}/components/inspector.xpt
%{_libdir}/%{name}/components/intl.xpt
@@ -637,6 +643,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.212 2007/08/02 19:29:12 qboosh
+- unified bconds (separate gnomeui/gnomevfs + gnome alias for convenience)
+- apply gnome* bconds to file list
+
Revision 1.211 2007/08/01 20:02:05 qboosh
- CVE references
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/mozilla-firefox.spec?r1=1.211&r2=1.212&f=u
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
