[xawtv] New upstream version 3.103

[Hans de Goede]

commit 32962aeab9d438774e5bf88a3065f83eca0dab71
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Tue Apr 2 16:05:57 2013 +0200

    New upstream version 3.103

 .gitignore    |    1 +
 sources       |    2 +-
 xawtv.desktop |    6 ++----
 xawtv.spec    |   56 +++++++++++++++++++++++++++++++++++---------------------
 4 files changed, 39 insertions(+), 26 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5aa2e91..714cacc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ xawtv-3.98.tar.bz2
 /xawtv-3.99.rc6.tar.bz2
 /xawtv-3.100.tar.bz2
 /xawtv-3.101.tar.bz2
+/xawtv-3.103.tar.bz2
diff --git a/sources b/sources
index 49c241a..17789a2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-330ce1789595e370be34ad4cae3dc3fa  xawtv-3.101.tar.bz2
+18822bb3660540fa9ea8b643a5b30d6b  xawtv-3.103.tar.bz2
diff --git a/xawtv.desktop b/xawtv.desktop
index 0cf1760..9556c72 100644
--- a/xawtv.desktop
+++ b/xawtv.desktop
@@ -1,10 +1,8 @@
 [Desktop Entry]
-Encoding=UTF-8
 Comment=X11 program for watching TV
-Icon=xawtv32x32.xpm
+Icon=xawtv
 Exec=xawtv
 Name=XawTV Television Viewer
-GenericName=Television Viewer
 Terminal=false
 Type=Application
-Categories=Application;AudioVideo;
+Categories=AudioVideo;
diff --git a/xawtv.spec b/xawtv.spec
index 50bdb36..01c6258 100644
--- a/xawtv.spec
+++ b/xawtv.spec
@@ -3,8 +3,8 @@
 
 Summary: TV applications for video4linux compliant devices
 Name: xawtv
-Version: 3.101
-Release: 7%{?dist}
+Version: 3.103
+Release: 1%{?dist}
 Group: Applications/Multimedia
 License: GPLv2+
 URL: http://git.linuxtv.org/xawtv3.git
@@ -27,12 +27,10 @@ BuildRequires: libdv-devel
 %endif
 BuildRequires: zvbi-devel, aalib-devel
 BuildRequires: gpm-devel, slang-devel
-BuildRequires: autoconf, desktop-file-utils
+BuildRequires: desktop-file-utils
 BuildRequires: libv4l-devel
 
-Requires: usermode xorg-x11-fonts-misc
-
-
+Requires: usermode xorg-x11-fonts-misc hicolor-icon-theme
 
 %description
 Xawtv is a simple xaw-based TV program which uses the bttv driver or
@@ -44,12 +42,8 @@ Xawtv also includes a grabber driver for vic.
 %prep
 %setup -q
 
-autoconf
-autoheader
-
 
 %build
-
 export CFLAGS="$RPM_OPT_FLAGS -Wno-pointer-sign"
 
 %if %{with motif}
@@ -60,7 +54,7 @@ export X_CFLAGS="-I/usr/include/openmotif"
 %configure \
     %{!?_with_motif: --disable-motif} \
     %{!?_with_quicktime: --disable-quicktime}
-make verbose=yes
+make %{?_smp_mflags} verbose=yes
 
 
 %install
@@ -74,12 +68,17 @@ rm -f $RPM_BUILD_ROOT%{_mandir}/*/mtt.*
 rm -f $RPM_BUILD_ROOT%{_bindir}/showqt
 %endif
 
+for i in 16x16 32x32 48x48; do
+  mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$i/apps
+  install -p -m 0644 contrib/%{name}$i.xpm \
+    $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$i/apps/%{name}.xpm
+done
 
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
-install -p -m 0644 contrib/xawtv*.xpm $RPM_BUILD_ROOT%{_datadir}/pixmaps
-
-desktop-file-install 	\
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications	\
+desktop-file-install \
+%if 0%{?fedora} && 0%{?fedora} < 19
+  --vendor fedora \
+%endif
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   %{SOURCE1}
  
 
@@ -90,7 +89,7 @@ mkdir -p $RPM_BUILD_ROOT%{_sbindir} \
 	$RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps \
 
 cat >v4l-conf.pam <<!
-#%PAM-1.0
+#%%PAM-1.0
 auth		sufficient	pam_rootok.so
 auth		required	pam_console.so
 account		required	pam_permit.so
@@ -110,6 +109,18 @@ mv $RPM_BUILD_ROOT%{_bindir}/v4l-conf $RPM_BUILD_ROOT%{_sbindir}/
 ln -s consolehelper $RPM_BUILD_ROOT%{_bindir}/v4l-conf
 
 
+%post
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+
+%postun
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
+
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
 
 %files
 %config(noreplace) %{_sysconfdir}/pam.d/v4l-conf
@@ -119,7 +130,7 @@ ln -s consolehelper $RPM_BUILD_ROOT%{_bindir}/v4l-conf
 %{_libdir}/xawtv
 %{_datadir}/xawtv
 %{_datadir}/X11/app-defaults/*
-%{_datadir}/pixmaps/*
+%{_datadir}/icons/hicolor/*/apps/%{name}.xpm
 %{_datadir}/applications/*
 %{_mandir}/man?/*
 %lang(es) %{_mandir}/es/*/*
@@ -133,6 +144,9 @@ ln -s consolehelper $RPM_BUILD_ROOT%{_bindir}/v4l-conf
 
 
 %changelog
+* Tue Apr  2 2013 Hans de Goede <hdegoede at redhat.com> 3.103-1
+- New upstream version 3.103
+
 * Sun Feb 10 2013 Parag Nemade <paragn AT fedoraproject DOT org> - 3.101-7
 - Remove vendor tag from desktop file as per https://fedorahosted.org/fesco/ticket/1077
 - Cleanup spec as per recently changed packaging guidelines
@@ -203,9 +217,9 @@ ln -s consolehelper $RPM_BUILD_ROOT%{_bindir}/v4l-conf
 - fix some typos in manuals  (patch7, derived from Debian)
 - fix recording from oss  (patch8, derived from Debian)
 - allow scantv to use another card's input  (patch9, derived from Debian)
-- some v4l2 code fixes  (patch10, Hans de Goede <j.w.r.degoede at hhs.nl>)
-- skip dga automatically when not available  (patch11, Hans de Goede)
-- specifying of bpl pitch for v4l-conf  (patch12, Hans de Goede)
+- some v4l2 code fixes (patch10, Hans de Goede <j.w.r.degoede at hhs.nl>)
+- skip dga automatically when not available (patch11, Hans de Goede)
+- specifying of bpl pitch for v4l-conf (patch12, Hans de Goede)
 - drop drv0-v4l2-old.so driver (assume not needed anyway now)
 - optional (default yes) build with libv4l wrapper library
   (patch100, Hans de Goede <j.w.r.degoede at hhs.nl>)