From 66977ef9ba60d955c767ee158aa03e7dbc06e286 Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede@redhat.com>
Date: Wed, 24 Feb 2016 15:19:00 +0100
Subject: [PATCH] Upgrade to new upstream release 1.10.0

- Use qt5 instead of qt4 for qv4l2
---
 .gitignore     |  1 +
 sources        |  2 +-
 v4l-utils.spec | 25 ++++++++++++++++---------
 3 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index 468e7f2..6663f26 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@
 /v4l-utils-1.6.0.tar.bz2
 /v4l-utils-1.6.2.tar.bz2
 /v4l-utils-1.8.1.tar.bz2
+/v4l-utils-1.10.0.tar.bz2
diff --git a/sources b/sources
index 25e3f99..c20a573 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f86d0938e46fde821dc10d4d2f6636e4  v4l-utils-1.8.1.tar.bz2
+945a38979138997e805828a4a53e53ec  v4l-utils-1.10.0.tar.bz2
diff --git a/v4l-utils.spec b/v4l-utils.spec
index e428c4a..0c31fe2 100644
--- a/v4l-utils.spec
+++ b/v4l-utils.spec
@@ -1,13 +1,13 @@
 Name:           v4l-utils
-Version:        1.8.1
-Release:        2%{?dist}
+Version:        1.10.0
+Release:        1%{?dist}
 Summary:        Utilities for video4linux and DVB devices
 Group:          Applications/System
 # libdvbv5, dvbv5 utils, ir-keytable and v4l2-sysfs-path are GPLv2 only
 License:        GPLv2+ and GPLv2
 URL:            http://www.linuxtv.org/downloads/v4l-utils/
 Source0:        http://linuxtv.org/downloads/v4l-utils/v4l-utils-%{version}.tar.bz2
-BuildRequires:  libjpeg-devel qt4-devel kernel-headers desktop-file-utils
+BuildRequires:  libjpeg-devel qt5-qtbase-devel kernel-headers desktop-file-utils
 BuildRequires:  alsa-lib-devel doxygen gettext
 # For /lib/udev/rules.d ownership
 Requires:       udev
@@ -109,9 +109,10 @@ make doxygen-run
 
 
 %install
+%{!?_udevrulesdir: %global _udevrulesdir /lib/udev/rules.d}
 %make_install
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
-rm $RPM_BUILD_ROOT%{_libdir}/{v4l1compat.so,v4l2convert.so}
+rm -f $RPM_BUILD_ROOT%{_libdir}/{v4l1compat.so,v4l2convert.so}
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man3/
 cp -arv %{_builddir}/%{name}-%{version}/doxygen-doc/man/man3 $RPM_BUILD_ROOT%{_mandir}/
 rm $RPM_BUILD_ROOT%{_mandir}/man3/_*3
@@ -141,12 +142,12 @@ fi
 gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
-%files -f %{name}.lang -f libdvbv5.lang
+%files -f %{name}.lang
 %doc README
 %dir %{_sysconfdir}/rc_keymaps
 %config(noreplace) %{_sysconfdir}/rc_maps.cfg
 %{_udevrulesdir}/70-infrared.rules
-%{_prefix}/lib/udev/rc_keymaps/*
+%{_udevrulesdir}/../rc_keymaps/*
 %{_bindir}/cx18-ctl
 %{_bindir}/dvb*
 %{_bindir}/ir-keytable
@@ -174,7 +175,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_mandir}/man1/qv4l2.1*
 
 %files -n libv4l
-%doc COPYING.libv4l COPYING ChangeLog README.libv4l TODO
+%doc ChangeLog README.libv4l TODO
+%license COPYING.libv4l COPYING
 %{_libdir}/libv4l
 %{_libdir}/libv4l*.so.*
 
@@ -184,8 +186,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_libdir}/libv4l*.so
 %{_libdir}/pkgconfig/libv4l*.pc
 
-%files -n libdvbv5
-%doc COPYING ChangeLog lib/libdvbv5/README
+%files -n libdvbv5 -f libdvbv5.lang
+%doc ChangeLog lib/libdvbv5/README
+%license COPYING
 %{_libdir}/libdvbv5*.so.*
 
 %files -n libdvbv5-devel
@@ -196,6 +199,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Wed Feb 24 2016 Hans de Goede <hdegoede@redhat.com> - 1.10.0-1
+- Upgrade to new upstream release 1.10.0
+- Use qt5 instead of qt4 for qv4l2
+
 * Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild