From 61250769ec3293a41ba9b0a39937099da1df724b129da349f2aadb93046e0c60 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Tue, 6 Dec 2011 18:11:06 +0000 Subject: [PATCH 1/2] Updating link to change in openSUSE:Factory/v4l-utils revision 4.0 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/v4l-utils?expand=0&rev=a5bd3c383b49d1e54d3fab173933e6af --- v4l-utils.spec | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/v4l-utils.spec b/v4l-utils.spec index 3c64d0e..a72b2cb 100644 --- a/v4l-utils.spec +++ b/v4l-utils.spec @@ -24,7 +24,7 @@ Release: 1 Summary: Utilities for video4linux and DVB devices # ir-keytable and v4l2-sysfs-path are GPLv2 only -License: GPLv2+ and GPLv2 +License: GPL-2.0+ and GPL-2.0 Url: http://linuxtv.org/downloads/v4l-utils/ Group: Hardware/TV Source0: http://linuxtv.org/downloads/v4l-utils/%{name}-%{version}.tar.bz2 @@ -63,7 +63,7 @@ v4l2-sysfs-path. %package devel-tools # decode_tm6000 is GPLv2 only -License: GPLv2+ and GPLv2 +License: GPL-2.0+ and GPL-2.0 Summary: Utilities for v4l2 / DVB driver development and debugging Group: Hardware/TV Requires: libv4l = %{version} @@ -74,7 +74,7 @@ v4l2-dbg. %package -n libv4l # Some of the decompression helpers are GPLv2, the rest is LGPLv2+ -License: LGPLv2+ and GPLv2 +License: LGPL-2.1+ and GPL-2.0 Summary: Collection of video4linux support libraries Url: http://hansdegoede.livejournal.com/3636.html Group: System/Libraries @@ -87,7 +87,7 @@ having to write separate code for different devices in the same class. libv4l consists of 3 different libraries: libv4lconvert, libv4l1 and libv4l2. %package -n libv4l1-0 -License: LGPLv2+ +License: LGPL-2.1+ Summary: Video4linux support library Group: System/Libraries Requires: libv4l @@ -100,7 +100,7 @@ v4l2 drivers do not). This package contains shared lib for packages that use libv4l1.so.0 %package -n libv4l2-0 -License: LGPLv2+ +License: LGPL-2.1+ Summary: Video4linux support library Group: System/Libraries Requires: libv4l @@ -112,7 +112,7 @@ application transparent libv4lconvert conversion where necessary. This package contains shared lib for packages that use libv4l2.so.0 %package -n libv4lconvert0 -License: LGPLv2+ +License: LGPL-2.1+ Summary: Video4linux support library Group: System/Libraries Requires: libv4l @@ -124,7 +124,7 @@ to V4l2_PIX_FMT_BGR24 or V4l2_PIX_FMT_YUV420. This package contains shared lib for packages that use libv4lconvert.so.0 %package -n libv4l-devel -License: LGPLv2+ +License: LGPL-2.1+ Summary: Development files for libv4l Group: Development/Libraries/C and C++ Requires: libv4l1-0 = %{version} @@ -136,7 +136,7 @@ The libv4l-devel package contains libraries and header files for developing applications that use libv4l. %package -n qv4l2 -License: GPLv2+ +License: GPL-2.0+ Summary: Video4linux test control and streaming test application Group: Hardware/TV Requires: libv4l = %{version} From 3d20866e2f066d78099cbc5f7b9fe306aa0f99e09fddfa30550db887e679d44b Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sun, 29 Jan 2012 00:58:07 +0000 Subject: [PATCH 2/2] Remove redundant tags/sections OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/v4l-utils?expand=0&rev=9 --- v4l-utils.changes | 5 +++++ v4l-utils.spec | 10 +--------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/v4l-utils.changes b/v4l-utils.changes index 97a1b02..472504b 100644 --- a/v4l-utils.changes +++ b/v4l-utils.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Jan 29 00:56:38 UTC 2012 - jengelh@medozas.de + +- Remove redundant tags/sections per specfile guideline suggestions + ------------------------------------------------------------------- Wed Aug 18 15:53:48 UTC 2011 - Rene.vanPaassen@gmail.com diff --git a/v4l-utils.spec b/v4l-utils.spec index a72b2cb..82e7f4e 100644 --- a/v4l-utils.spec +++ b/v4l-utils.spec @@ -1,7 +1,7 @@ # # spec file for package v4l-utils # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,7 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Name: v4l-utils @@ -52,10 +51,6 @@ BuildRequires: update-desktop-files Requires: libv4l = %{version} Requires: udev -%define debug_package_requires libv4l1-0 = %{version}-%{release} -%define debug_package_requires libv4l2-0 = %{version}-%{release} -%define debug_package_requires libv4lconvert0 = %{version}-%{release} - %description v4l-utils is a collection of various video4linux (V4L) and DVB utilities. The main v4l-utils package contains cx18-ctl, ir-keytable, ivtv-ctl, v4l2-ctl and @@ -162,9 +157,6 @@ mogrify -scale 32x32 -background transparent %{buildroot}%{_datadir}/icons/hicol %suse_update_desktop_file -N "QV4l2" -G "V4L2 Test Utility" -r qv4l2 Qt AudioVideo Video TV %endif -%clean -rm -rf %{buildroot} - %post -n libv4l1-0 -p /sbin/ldconfig %postun -n libv4l1-0 -p /sbin/ldconfig