rpms/xine-lib
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into f15/master

Browse Source 
Conflicts:
	xine-lib.spec
This commit is contained in:
Rex Dieter 2011-02-14 10:47:59 -06:00
commit 5f8fd1a05a
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
xine-lib.spec
View File

@ -39,7 +39,7 @@
%endif %endif
%if 0%{?fedora} > 14 %if 0%{?fedora} > 14
%undefine _enable_v4l %define _disable_v4l1 1
%endif %endif
%if 0%{?fedora} > 11 || 0%{?rhel} > 5 %if 0%{?fedora} > 11 || 0%{?rhel} > 5
@ -283,6 +283,12 @@ rm -Rf $RPM_BUILD_ROOT%{_libdir}/libxine.la __docs/README \
# Directory for binary codecs # Directory for binary codecs
mkdir -p $RPM_BUILD_ROOT%{codecdir} mkdir -p $RPM_BUILD_ROOT%{codecdir}
# unpackaged files
%if 0%{?_disable_v4l1:1}
rm -fv $RPM_BUILD_ROOT%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_pvr.so
rm -fv $RPM_BUILD_ROOT%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_v4l.so
%endif
%clean %clean
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
@ -390,10 +396,10 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_rtsp.so %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_rtsp.so
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_stdin_fifo.so %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_stdin_fifo.so
%if 0%{?_enable_v4l:1} %if 0%{?_enable_v4l:1}
%if ! 0%{?_disable_v4l1:1}
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_pvr.so %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_pvr.so
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_v4l.so %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_v4l.so
%endif %endif
%if 0%{?_enable_libv4l:1}
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_v4l2.so %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_v4l2.so
%endif %endif
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_fb.so %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_fb.so