packages: vlc/vlc.spec - it should be possible to turn off bcond via comman...

[glen]

Author: glen                         Date: Fri Dec 23 11:52:40 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- it should be possible to turn off bcond via commandline
- package lua/extensions dir

---- Files affected:
packages/vlc:
   vlc.spec (1.283 -> 1.284) 

---- Diffs:

================================================================
Index: packages/vlc/vlc.spec
diff -u packages/vlc/vlc.spec:1.283 packages/vlc/vlc.spec:1.284
--- packages/vlc/vlc.spec:1.283	Fri Dec 23 09:00:40 2011
+++ packages/vlc/vlc.spec	Fri Dec 23 12:52:35 2011
@@ -7,6 +7,7 @@
 # - configs to /etc (../http/.hosts)
 # - package lua files
 # - qvlc should be in qt4 or such package not generic X11
+# - /usr/share/vlc/utils scripts insecure (use /tmp hardcoded paths)
 #
 # Conditional build:
 %bcond_without	aalib		# build without aalib support
@@ -37,10 +38,10 @@
 %bcond_without	udev		# udev services discovery
 %bcond_without	upnp		# upnp plugin
 %bcond_without	x264		# build without x264 support
-%bcond_with	v4l1		# video4linux v1
+%bcond_without	v4l1		# video4linux v1
 
-%if "%(test -f %{_includedir}/linux/videodev.h && echo 1 || echo 0)" == "1"
-%global	with_v4l1	1
+%if "%(test -f %{_includedir}/linux/videodev.h && echo 0 || echo 1)" == "1"
+%undefine	with_v4l1
 %endif
 
 Summary:	VLC - a multimedia player and stream server
@@ -393,11 +394,13 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
 %{__make} install \
 	npvlcdir=%{_browserpluginsdir} \
 	DESTDIR=$RPM_BUILD_ROOT
 
+# dir for lua extensions
+install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/lua/extensions
+
 %{__rm} -r $RPM_BUILD_ROOT%{_docdir}/vlc
 
 %if "%{_lib}" != "lib"
@@ -793,7 +796,8 @@
 %attr(755,root,root) %{_libdir}/vlc/plugins/visualization/libvisual_plugin.so
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/http
-%{_datadir}/%{name}/lua
+%dir %{_datadir}/%{name}/lua
+%dir %{_datadir}/%{name}/lua/extensions
 %{_datadir}/%{name}/osdmenu
 %dir %{_datadir}/%{name}/utils
 %attr(755,root,root) %{_datadir}/%{name}/utils/*.sh
@@ -869,6 +873,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.284  2011/12/23 11:52:35  glen
+- it should be possible to turn off bcond via commandline
+- package lua/extensions dir
+
 Revision 1.283  2011/12/23 08:00:40  arekm
 - rel 2; v4l1 as bcond, only on old llh
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/vlc/vlc.spec?r1=1.283&r2=1.284&f=u