From 212ab1a89344dced9a488ae49754a6bc5ebca909a7e25e9d6d1b2c1a84324ef0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= <ismail@i10z.com>
Date: Sun, 27 Jul 2014 12:22:14 +0000
Subject: [PATCH] Accepting request 242552 from
 home:adra:branches:devel:libraries:c_c++

Update to version 1.2.1, Added alsa-devel build requirement, Removed bufferoverflowstrncat.patch (fixed upstream)

OBS-URL: https://build.opensuse.org/request/show/242552
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/v4l-utils?expand=0&rev=29
---
 bufferoverflowstrncat.patch | 11 -----------
 v4l-utils-1.0.1.tar.bz2     |  3 ---
 v4l-utils-1.2.1.tar.bz2     |  3 +++
 v4l-utils.changes           |  9 +++++++++
 v4l-utils.spec              | 19 ++++++++++++++-----
 5 files changed, 26 insertions(+), 19 deletions(-)
 delete mode 100644 bufferoverflowstrncat.patch
 delete mode 100644 v4l-utils-1.0.1.tar.bz2
 create mode 100644 v4l-utils-1.2.1.tar.bz2

diff --git a/bufferoverflowstrncat.patch b/bufferoverflowstrncat.patch
deleted file mode 100644
index 4e475f7..0000000
--- a/bufferoverflowstrncat.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/libdvbv5/descriptors.c.orig	2014-01-13 21:51:46.000000000 +0200
-+++ lib/libdvbv5/descriptors.c	2014-06-04 21:49:02.691930747 +0300
-@@ -1007,7 +1007,7 @@
- 	{
- 		char t[4];
- 		snprintf (t, sizeof(t), "%02x ", (unsigned int) data[i]);
--		strncat (hex, t, sizeof(hex));
-+		strncat (hex, t, sizeof(hex) - 1);
- 		if (data[i] > 31 && data[i] < 128 )
- 			ascii[j] = data[i];
- 		else
diff --git a/v4l-utils-1.0.1.tar.bz2 b/v4l-utils-1.0.1.tar.bz2
deleted file mode 100644
index d668295..0000000
--- a/v4l-utils-1.0.1.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fc0132e82a18dfad9619be3abf50c206e2f449b1c14440cde36f25874fdce7df
-size 971381
diff --git a/v4l-utils-1.2.1.tar.bz2 b/v4l-utils-1.2.1.tar.bz2
new file mode 100644
index 0000000..ae3f62a
--- /dev/null
+++ b/v4l-utils-1.2.1.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9b658fbcaaf8127115316e07fea314aebc21dd6dc3491cd8753a768521c4b9af
+size 1042071
diff --git a/v4l-utils.changes b/v4l-utils.changes
index b5395c8..d89bd16 100644
--- a/v4l-utils.changes
+++ b/v4l-utils.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Sat Jul 26 21:08:16 UTC 2014 - asterios.dramis@gmail.com
+
+- Update to version 1.2.1:
+  * Lots of changes: See ChangeLog for details.
+- Added alsa-devel build requirement.
+- Use autoreconf to fix build in openSUSE 12.2.
+- Removed bufferoverflowstrncat.patch (fixed upstream).
+
 -------------------------------------------------------------------
 Wed Jun  4 19:51:21 UTC 2014 - asterios.dramis@gmail.com
 
diff --git a/v4l-utils.spec b/v4l-utils.spec
index 6f48cb0..9314266 100644
--- a/v4l-utils.spec
+++ b/v4l-utils.spec
@@ -20,7 +20,7 @@
 %define so_ver 0
 
 Name:           v4l-utils
-Version:        1.0.1
+Version:        1.2.1
 Release:        0
 Summary:        Utilities for video4linux and DVB devices
 License:        GPL-2.0+ and GPL-2.0
@@ -28,8 +28,10 @@ Group:          Hardware/TV
 Url:            http://linuxtv.org/downloads/v4l-utils/
 Source0:        http://linuxtv.org/downloads/v4l-utils/%{name}-%{version}.tar.bz2
 Source100:      baselibs.conf
-# PATCH-FIX-UPSTREAM bufferoverflowstrncat.patch asterios.dramis@gmail.com -- Fix rpm post build check error "Statement might be overflowing a buffer in strncat"
-Patch0:         bufferoverflowstrncat.patch
+BuildRequires:  alsa-devel
+%if 0%{?suse_version} < 1230
+BuildRequires:  autoconf
+%endif
 %if 0%{?suse_version} > 1210
 BuildRequires:  desktop-file-utils
 %else
@@ -38,6 +40,9 @@ BuildRequires:  update-desktop-files
 BuildRequires:  kernel-headers
 BuildRequires:  libjpeg-devel
 BuildRequires:  libqt4-devel
+%if 0%{?suse_version} < 1230
+BuildRequires:  libtool
+%endif
 BuildRequires:  pkg-config
 BuildRequires:  udev
 Requires:       libv4l = %{version}
@@ -54,7 +59,7 @@ Group:          Hardware/TV
 Requires:       libv4l = %{version}
 
 %description devel-tools
-Utilities for v4l2 / DVB driver authors.
+Utilities for v4l2 / DVB driver authors for development and debugging.
 
 %package -n libv4l
 Summary:        Collection of video4linux support libraries
@@ -140,9 +145,11 @@ qv4l2 is a test control and streaming test application for video4linux.
 
 %prep
 %setup -q
-%patch0
 
 %build
+%if 0%{?suse_version} < 1230
+autoreconf -vif
+%endif
 %configure --disable-static --disable-silent-rules --with-udevdir=%{_udevdir}
 make %{?_smp_mflags}
 
@@ -193,6 +200,7 @@ desktop-file-edit --set-name="QV4l2" --set-generic-name="V4L2 Test Utility" \
 %{_bindir}/dvbv5-*
 %{_bindir}/ir-keytable
 %{_bindir}/ivtv-ctl
+%{_bindir}/media-ctl
 %{_bindir}/rds-ctl
 %{_bindir}/v4l2-ctl
 %{_bindir}/v4l2-sysfs-path
@@ -244,5 +252,6 @@ desktop-file-edit --set-name="QV4l2" --set-generic-name="V4L2 Test Utility" \
 %dir %{_datadir}/icons/hicolor/scalable
 %dir %{_datadir}/icons/hicolor/scalable/apps
 %{_datadir}/icons/hicolor/*/apps/qv4l2.*
+%{_mandir}/man1/qv4l2.1%{ext_man}
 
 %changelog