packages: chromium-browser/chromium-browser.spec - pulseaudio, cups, gconf ...

[glen]

Author: glen                         Date: Mon Nov 14 07:28:04 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- pulseaudio, cups, gconf bconds

---- Files affected:
packages/chromium-browser:
   chromium-browser.spec (1.146 -> 1.147) 

---- Diffs:

================================================================
Index: packages/chromium-browser/chromium-browser.spec
diff -u packages/chromium-browser/chromium-browser.spec:1.146 packages/chromium-browser/chromium-browser.spec:1.147
--- packages/chromium-browser/chromium-browser.spec:1.146	Mon Nov 14 08:19:05 2011
+++ packages/chromium-browser/chromium-browser.spec	Mon Nov 14 08:27:59 2011
@@ -5,6 +5,9 @@
 %bcond_without	ffmpegsumo		# build with ffmpegsumo
 %bcond_with		kerberos		# build with kerberos support (dlopened if support compiled, library names in src/net/http/http_auth_gssapi_posix.cc)
 %bcond_without	keyring 		# with keyring support (gnome-keyring dlopened, kwalletd via dbus)
+%bcond_without	cups			# with cups
+%bcond_without	gconf			# with GConf
+%bcond_without	pulseaudio		# with pulseaudio
 %bcond_with		nacl			# build Native Client support
 %bcond_without	sandboxing		# with sandboxing
 %bcond_with		selinux			# with SELinux (need policy first)
@@ -76,13 +79,13 @@
 Patch7:		dlopen_sonamed_gl.patch
 Patch8:		chromium_useragent.patch.in
 URL:		http://www.chromium.org/Home
-BuildRequires:	GConf2-devel
+%{?with_gconf:BuildRequires:	GConf2-devel}
 BuildRequires:	OpenGL-GLU-devel
 BuildRequires:	alsa-lib-devel
 BuildRequires:	atk-devel
 BuildRequires:	bison
 BuildRequires:	bzip2-devel
-BuildRequires:	cups-devel
+%{?with_cups:BuildRequires:	cups-devel}
 BuildRequires:	dbus-glib-devel
 %{?with_system_flac:BuildRequires:	flac-devel}
 BuildRequires:	flex
@@ -109,7 +112,7 @@
 BuildRequires:	pango-devel
 BuildRequires:	perl-modules
 BuildRequires:	pkgconfig
-BuildRequires:	pulseaudio-devel
+%{?with_pulseaudio:BuildRequires:	pulseaudio-devel}
 BuildRequires:	python
 #BuildRequires:	python-gyp >= 1-%{gyp_rev}
 BuildRequires:	python-modules
@@ -273,16 +276,11 @@
 	-Duse_system_xdg_utils=1 \
 	-Duse_system_yasm=%{?with_system_yasm:1}%{!?with_system_yasm:0} \
 	-Duse_system_zlib=%{?with_system_zlib:1}%{!?with_system_zlib:0} \
-%if %{with kerberos}
-	-Duse_kerberos=1 -Dlinux_link_kerberos=0 \
-%else
-	-Duse_kerberos=0 \
-%endif
-%if %{with keyring}
-	-Duse_gnome_keyring=1 -Dlinux_link_gnome_keyring=0 \
-%else
-	-Duse_gnome_keyring=0 \
-%endif
+	-Duse_cups=%{?with_cups:1}%{!?with_cups:0} \
+	-Duse_gconf=%{?with_gconf:1}%{!?with_gconf:0} \
+	-Duse_gnome_keyring==%{?with_keyring:1 -Dlinux_link_gnome_keyring=0}%{!?with_keyring:0} \
+	-Duse_kerberos=%{?with_kerberos:1 -Dlinux_link_kerberos=0}%{!?with_kerberos:0} \
+	-Duse_pulseaudio=%{?with_pulseaudio:1}%{!?with_pulseaudio:0} \
 
 %{__make} chrome %{?with_sandboxing:chrome_sandbox} \
 	BUILDTYPE=%{!?debug:Release}%{?debug:Debug} \
@@ -370,6 +368,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.147  2011/11/14 07:27:59  glen
+- pulseaudio, cups, gconf bconds
+
 Revision 1.146  2011/11/14 07:19:05  glen
 - use system flac, enable system yasm bcond
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/chromium-browser/chromium-browser.spec?r1=1.146&r2=1.147&f=u