[xawtv] update to 3.99.rc6

[Dmitry Butskoy]

commit 768ba1d65f13b6243aef262e43b9933dd1a667a2
Author: Dmitry Butskoy <Dmitry at Butskoy.name>
Date:   Thu Feb 17 18:28:27 2011 +0300

    update to 3.99.rc6

 .gitignore |    1 +
 sources    |    2 +-
 xawtv.spec |   34 +++++++++++++++++++++++++++-------
 3 files changed, 29 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d822fb0..2113563 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ xawtv-3.98.tar.bz2
 /xawtv-3.99.rc2.tar.bz2
 /xawtv-3.99.rc3.tar.bz2
 /xawtv-3.99.rc4.tar.bz2
+/xawtv-3.99.rc6.tar.bz2
diff --git a/sources b/sources
index 3c565a2..f8491be 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-309e00604da2f82f2eb890bed29c7bf3  xawtv-3.99.rc4.tar.bz2
+5dd4e1130f571bb0df68c72a3a3c3d43  xawtv-3.99.rc6.tar.bz2
diff --git a/xawtv.spec b/xawtv.spec
index 4868150..76037e2 100644
--- a/xawtv.spec
+++ b/xawtv.spec
@@ -1,7 +1,10 @@
+%bcond_with	motif
+%bcond_with	quicktime
+
 Summary: TV applications for video4linux compliant devices
 Name: xawtv
-Version: 3.99.rc4
-Release: 2%{?dist}
+Version: 3.99.rc6
+Release: 1%{?dist}
 Group: Applications/Multimedia
 License: GPLv2+
 URL: http://git.linuxtv.org/xawtv3.git
@@ -13,6 +16,9 @@ BuildRequires: mesa-libGL-devel, libXaw-devel, libXext-devel
 BuildRequires: libFS-devel, libXft-devel, libXinerama-devel
 BuildRequires: libXpm-devel, libXrandr-devel, libXt-devel
 BuildRequires: libXxf86dga-devel, libXv-devel
+#  Note: it compiles with lesstif-devel, but does not work properly.
+%{?with_motif:BuildRequires: openmotif-devel}
+%{?with_quicktime:BuildRequires: libquicktime-devel}
 
 BuildRequires: ncurses-devel, fileutils, libjpeg-devel, libpng-devel
 BuildRequires: alsa-lib-devel
@@ -47,7 +53,14 @@ autoheader
 
 export CFLAGS="$RPM_OPT_FLAGS -Wno-pointer-sign"
 
-%configure --disable-motif --disable-quicktime
+%if %{with motif}
+export X_LIBS="-L/usr/lib/openmotif"
+export X_CFLAGS="-I/usr/include/openmotif"
+%endif
+
+%configure \
+    %{!?_with_motif: --disable-motif} \
+    %{!?_with_quicktime: --disable-quicktime}
 make verbose=yes
 
 
@@ -56,11 +69,13 @@ rm -rf $RPM_BUILD_ROOT
 
 make DESTDIR=$RPM_BUILD_ROOT SUID_ROOT="" install
 
-#  we have no motif support
+%if %{without motif}
 rm -f $RPM_BUILD_ROOT%{_mandir}/*/motv.*
 rm -f $RPM_BUILD_ROOT%{_mandir}/*/mtt.*
-#  we have no quicktime support
+%endif
+%if %{without quicktime}
 rm -f $RPM_BUILD_ROOT%{_bindir}/showqt
+%endif
 
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
@@ -117,11 +132,16 @@ rm -fr $RPM_BUILD_ROOT
 %lang(es) %{_mandir}/es/*/*
 %lang(fr) %{_mandir}/fr/*/*
 %doc COPYING README TODO contrib/frequencies*
+%if %{with motif}
+%lang(de) %{_datadir}/X11/de_DE.UTF-8/app-defaults/*
+%lang(fr) %{_datadir}/X11/fr_FR.UTF-8/app-defaults/*
+%lang(fr) %{_datadir}/X11/it_IT.UTF-8/app-defaults/*
+%endif
 
 
 %changelog
-* Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.99.rc4-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+* Thu Feb 17 2011 Dmitry Butskoy <Dmitry at Butskoy.name> - 3.99.rc6-1
+- update to Xawtv version 3.99.rc6
 
 * Thu Feb  3 2011 Dmitry Butskoy <Dmitry at Butskoy.name> - 3.99.rc4-1
 - update to Xawtv version 3.99.rc4