SPECS (DEVEL): mozilla-firefox.spec - added gnome bcond - pango 1....

qboosh qboosh at pld-linux.org
Fri Dec 9 14:20:46 CET 2005


Author: qboosh                       Date: Fri Dec  9 13:20:46 2005 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- added gnome bcond
- pango 1.6.0 is required for --enable-pango (1.1.0 suffices for --enable-xft alone)

---- Files affected:
SPECS:
   mozilla-firefox.spec (1.95.2.6 -> 1.95.2.7) 

---- Diffs:

================================================================
Index: SPECS/mozilla-firefox.spec
diff -u SPECS/mozilla-firefox.spec:1.95.2.6 SPECS/mozilla-firefox.spec:1.95.2.7
--- SPECS/mozilla-firefox.spec:1.95.2.6	Fri Dec  9 13:54:05 2005
+++ SPECS/mozilla-firefox.spec	Fri Dec  9 14:20:17 2005
@@ -7,6 +7,7 @@
 #
 # Conditional build:
 %bcond_with	tests	# enable tests (whatever they check)
+%bcond_without	gnome	# disable all GNOME components (gnomevfs, gnome, gnomeui)
 #
 Summary:	Mozilla Firefox web browser
 Summary(pl):	Mozilla Firefox - przeglądarka WWW
@@ -25,18 +26,21 @@
 # UPDATE or DROP?
 #PatchX:		%{name}-searchplugins.patch
 URL:		http://www.mozilla.org/projects/firefox/
+%{?with_gnome:BuildRequires:	GConf2-devel >= 1.2.1}
 BuildRequires:	automake
 BuildRequires:	cairo-devel >= 1.0.0
 BuildRequires:	gtk+2-devel >= 1:2.0.0
-BuildRequires:	heimdal-devel >= 0.7
+%{?with_gnome:BuildRequires:	gnome-vfs-devel >= 2.0}
 BuildRequires:	libIDL-devel >= 0.8.0
+%{?with_gnome:BuildRequires:	libgnome-devel >= 2.0}
+%{?with_gnome:BuildRequires:	libgnomeui-devel >= 2.2.0}
 BuildRequires:	libjpeg-devel >= 6b
 BuildRequires:	libpng-devel >= 1.2.0
 BuildRequires:	libstdc++-devel
 BuildRequires:	nspr-devel >= 1:4.6-0.20041030.1
 BuildRequires:	nss-devel >= 3.8
-BuildRequires:	pango-devel >= 1:1.1.0
-BuildRequires:	perl-modules
+BuildRequires:	pango-devel >= 1:1.6.0
+BuildRequires:	perl-modules >= 5.004
 BuildRequires:	pkgconfig
 BuildRequires:	zip
 Requires:	%{name}-lang-resources = %{version}
@@ -114,6 +118,7 @@
 	--disable-composer \
 	--disable-dtd-debug \
 	--disable-freetype \
+	%{!?with_gnome:--disable-gnomevfs --disable-gnomeui} \
 	--disable-installer \
 	--disable-jsd \
 	--disable-ldap \
@@ -324,6 +329,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.95.2.7  2005/12/09 13:20:17  qboosh
+- added gnome bcond
+- pango 1.6.0 is required for --enable-pango (1.1.0 suffices for --enable-xft alone)
+
 Revision 1.95.2.6  2005/12/09 12:54:05  qboosh
 - gfx patch obsolete too
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/mozilla-firefox.spec?r1=1.95.2.6&r2=1.95.2.7&f=u




More information about the pld-cvs-commit mailing list