SPECS: vlc.spec - sorted bconds - switched on bconds: mozilla, svg...

[sls]

Author: sls                          Date: Mon Apr  7 01:53:30 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- sorted bconds
- switched on bconds: mozilla, svgalib, hal
- more TODO
- removed slp bcond (2004: Openslp is broken, temporarily removed)
- fixed BR for mozilla bcond

---- Files affected:
SPECS:
   vlc.spec (1.133 -> 1.134) 

---- Diffs:

================================================================
Index: SPECS/vlc.spec
diff -u SPECS/vlc.spec:1.133 SPECS/vlc.spec:1.134
--- SPECS/vlc.spec:1.133	Mon Apr  7 02:20:14 2008
+++ SPECS/vlc.spec	Mon Apr  7 03:53:25 2008
@@ -7,23 +7,24 @@
 # - go through the configure --help and add all options with proper
 #   reqs and bconds
 # - flac plugin doesn't work with mono files
+# - what really changes live bcond?
+# - install mozilla plugin to some nice dir (now _libdir/mozilla/plugins/libvlcplugin.so)
 #
 # Conditional build:
 %bcond_without	aalib	# build without aalib support
-%bcond_without	caca	# build without caca support
-%bcond_without	dv	# build without dv support
-%bcond_without	lirc	# build without lirc support
-%bcond_without	x264	# build without x264 support
 %bcond_without	alsa	# don't build alsa plugin
 %bcond_without	arts	# don't build arts plugin
+%bcond_without	caca	# build without caca support
+%bcond_without	dv	# build without dv support
 %bcond_without	esound	# don't build esound plugin
 %bcond_without	ggi	# don't build ggi plugin
+%bcond_without	hal	# build with hal support
+%bcond_without	lirc	# build without lirc support
 %bcond_without	live	# build without live.com support
+%bcond_without	mozilla	# build mozilla plugin
 %bcond_without	speex	# don't build speex plugin
-%bcond_with	mozilla	# build mozilla plugin
-%bcond_with	slp	# build with slp, broken
-%bcond_with	svgalib	# build with svgalib video_output
-%bcond_with	hal	# build with hal support
+%bcond_without	svgalib	# build with svgalib video_output
+%bcond_without	x264	# build without x264 support
 #
 Summary:	VLC - a multimedia player and stream server
 Summary(pl.UTF-8):	VLC - odtwarzacz multimedialny oraz serwer strumieni
@@ -87,7 +88,6 @@
 BuildRequires:	libxml2-devel
 %{?with_lirc:BuildRequires:	lirc-devel}
 %{?with_live:BuildRequires:	live >= 2005.03.11}
-%{?with_mozilla:BuildRequires:	mozilla-devel}
 BuildRequires:	mpeg2dec-devel >= 0.3.2
 BuildRequires:	ncurses-devel
 %{?with_slp:BuildRequires:	openslp-devel}
@@ -96,7 +96,9 @@
 %{?with_svgalib:BuildRequires:	svgalib-devel}
 BuildRequires:	vcdimager-devel
 BuildRequires:	wxGTK2-unicode-devel >= 2.6.2-2
+%{?with_mozilla:BuildRequires:	xorg-lib-libXt-devel}
 BuildRequires:	xosd-devel
+%{?with_mozilla:BuildRequires:	xulrunner-devel}
 BuildRequires:	xvid-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -494,6 +496,7 @@
 %attr(755,root,root) %{_libdir}/vlc/packetizer/libpacketizer_mpeg4video_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/packetizer/libpacketizer_mpegvideo_plugin.so
 %dir %{_libdir}/vlc/services_discovery
+%{?with_hal:%attr(755,root,root) %{_libdir}/vlc/services_discovery/libhal_plugin.so}
 %attr(755,root,root) %{_libdir}/vlc/services_discovery/libpodcast_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/services_discovery/libsap_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/services_discovery/libshout_plugin.so
@@ -537,6 +540,7 @@
 %attr(755,root,root) %{_libdir}/vlc/video_filter/libtransform_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/video_filter/libwall_plugin.so
 %dir %{_libdir}/vlc/video_output
+%{?with_svgalib:%attr(755,root,root) %{_libdir}/vlc/video_output/libsvgalib_plugin.so}
 %dir %{_libdir}/vlc/visualization
 %attr(755,root,root) %{_libdir}/vlc/visualization/libvisual_plugin.so
 %dir %{_datadir}/%{name}
@@ -611,6 +615,13 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.134  2008-04-07 01:53:25  sls
+- sorted bconds
+- switched on bconds: mozilla, svgalib, hal
+- more TODO
+- removed slp bcond (2004: Openslp is broken, temporarily removed)
+- fixed BR for mozilla bcond
+
 Revision 1.133  2008-04-07 00:20:14  sls
 - bconded speex plugin
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/vlc.spec?r1=1.133&r2=1.134&f=u