Update spec file and add new license files for BSD license

[Version] 1.6.0-5
[Profile] Common
[Issue Type] Update
[Dependency module] N/A

Change-Id: I4ba1139c69d197b614d9905075a4e025c86b374c
Signed-off-by: Jeongmo Yang <jm80.yang@samsung.com>

diff --git a/COPYING.BSD-2-Clause b/COPYING.BSD-2-Clause
new file mode 100644 (file)
index 0000000..125adbe
--- /dev/null
+++ b/COPYING.BSD-2-Clause
@@ -0,0 +1,24 @@
+Copyright (c) 2009 Hans Petter Selasky All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

diff --git a/COPYING.BSD-3-Clause b/COPYING.BSD-3-Clause
new file mode 100644 (file)
index 0000000..918c618
--- /dev/null
+++ b/COPYING.BSD-3-Clause
@@ -0,0 +1,28 @@
+Copyright (c) 2006, Luc Saillard <luc@saillard.org> All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the Xiph.org Foundation nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

diff --git a/COPYING b/COPYING.GPL-2.0
similarity index 100%
rename from COPYING
rename to COPYING.GPL-2.0

diff --git a/COPYING.libv4l b/COPYING.LGPL-2.1
similarity index 100%
rename from COPYING.libv4l
rename to COPYING.LGPL-2.1

diff --git a/packaging/v4l-utils.spec b/packaging/v4l-utils.spec
index ec1379d..755cabc 100644 (file)
--- a/packaging/v4l-utils.spec
+++ b/packaging/v4l-utils.spec
@@ -14,9 +14,9 @@
 
 Name:           v4l-utils
 Version:        1.6.0
-Release:        4
+Release:        5
 Summary:        Utilities for video4linux and DVB devices
-License:        LGPL-2.1+
+License:        LGPL-2.1 and BSD-2-Clause and BSD-3-Clause
 Group:          Multimedia/Utilities
 Url:            http://linuxtv.org/downloads/v4l-utils/
 Source0:        %{name}-%{version}.tar.bz2
@@ -35,7 +35,6 @@ v4l2-sysfs-path.
 
 %package -n libv4l
 Summary:        Collection of video4linux support libraries
-License:        LGPL-2.1+
 Group:          Multimedia/Libraries
 
 %description -n libv4l
@@ -47,7 +46,6 @@ consists of 3 different libraries: libv4lconvert, libv4l1 and libv4l2.
 
 %package -n libv4l-devel
 Summary:        Development files for libv4l
-License:        LGPL-2.1+
 Group:          Multimedia/Development
 Requires:       libv4l = %{version}-%{release}
 
@@ -73,8 +71,7 @@ export CFLAGS="%{optflags} -fno-strict-aliasing"
 
 %files
 %manifest %{name}.manifest
-#%license COPYING
-%license COPYING.libv4l
+#%license COPYING.GPL-2.0
 #%config(noreplace) %{_sysconfdir}/rc_maps.cfg
 #%{_bindir}/cx18-ctl
 #%{_bindir}/dvb-*
@@ -95,16 +92,17 @@ export CFLAGS="%{optflags} -fno-strict-aliasing"
 
 %files -n libv4l
 %manifest %{name}.manifest
-%license COPYING.lib*
+%license COPYING.LGPL-2.1 COPYING.BSD*
 %{_libdir}/libv4l/v4l*.so
 %{_libdir}/libv4l/plugins/*.so
 %{_libdir}/lib*.so.*
 
 %files -n libv4l-devel
-%license COPYING.lib*
+%license COPYING.LGPL-2.1 COPYING.BSD*
 %doc README.lib-multi-threading
 %{_includedir}/libv4l*.h
 #%{_includedir}/*/*.h
 %{_libdir}/lib*.so
 %{_libdir}/pkgconfig/*.pc
 #%{_mandir}/*
+