Author: glen Date: Fri Sep 10 18:10:17 2010 GMT
Module: packages Tag: AC-branch
---- Log message:
- xvid bcond, fcsking fails on ppc
---- Files affected:
packages/avifile:
avifile.spec (1.205.2.4 -> 1.205.2.5)
---- Diffs:
================================================================
Index: packages/avifile/avifile.spec
diff -u packages/avifile/avifile.spec:1.205.2.4
packages/avifile/avifile.spec:1.205.2.5
--- packages/avifile/avifile.spec:1.205.2.4 Fri Sep 10 17:07:36 2010
+++ packages/avifile/avifile.spec Fri Sep 10 20:10:12 2010
@@ -2,8 +2,8 @@
#
# Conditional build:
%bcond_without qt # don't build Qt-based utilities (incl. aviplay)
-%bcond_with divx # enables divx4linux support (proprietary, binary-only
- # lib) note: if disabled, divx is decoded by ffmpeg
+%bcond_with divx # enables divx4linux support (proprietary, binary-only
lib) note: if disabled, divx is decoded by ffmpeg
+%bcond_without xvid # xvid support
%bcond_with nas # enable NAS support
#
Summary: Library for playing AVI files
@@ -11,7 +11,7 @@
Summary(pt_BR.UTF-8): Biblioteca para reproduzir formatos de áudio e vídeo
usando binários win32
Name: avifile
Version: 0.7.45
-Release: 16
+Release: 17
Epoch: 3
License: GPL
Group: X11/Libraries
@@ -63,7 +63,7 @@
%{?with_qt:BuildRequires: qt-devel >= 2.0.0}
BuildRequires: rpmbuild(macros) >= 1.213
BuildRequires: xft-devel
-BuildRequires: xvid-devel >= 1:1.0.0
+%{?with_xvid:BuildRequires: xvid-devel >= 1:1.0.0}
BuildConflicts: wine-devel
Obsoletes: avifile-vidix-nvidia
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -511,9 +511,11 @@
%attr(755,root,root) %{_libdir}/avifile*/win32.so
%endif
+%if %{with xvid}
%files xvid
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/avifile*/xvid4.so
+%endif
%ifarch %{ix86}
%files vidix-driver-fb
@@ -547,6 +549,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.205.2.5 2010/09/10 18:10:12 glen
+- xvid bcond, fcsking fails on ppc
+
Revision 1.205.2.4 2010/09/10 15:07:36 glen
- release 16
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/avifile/avifile.spec?r1=1.205.2.4&r2=1.205.2.5&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
