From d45817b23ad47c9819699a0522037a9e0a0794bc Mon Sep 17 00:00:00 2001 From: sangho park Date: Tue, 29 Aug 2023 15:28:11 +0900 Subject: [PATCH] packaging: drop BSD license [Version] : 4.7.0-2 [Issue type] : drop license Drop BSD license because OpenCV 4.5.0 and higher versions are licensed under the Apache 2 License Change-Id: I0b54c0ea0a5878f66a14b1f8810de77bd7af8e30 Signed-off-by: sangho park --- LICENSE.BSD-3-Clause | 42 ------------------------------------------ packaging/opencv.spec | 6 +++--- 2 files changed, 3 insertions(+), 45 deletions(-) delete mode 100644 LICENSE.BSD-3-Clause diff --git a/LICENSE.BSD-3-Clause b/LICENSE.BSD-3-Clause deleted file mode 100644 index f028c82..0000000 --- a/LICENSE.BSD-3-Clause +++ /dev/null @@ -1,42 +0,0 @@ -This license applies to all parts of Protocol Buffers except the following: - - - Atomicops support for generic gcc, located in - src/google/protobuf/stubs/atomicops_internals_generic_gcc.h. - This file is copyrighted by Red Hat Inc. - - - Atomicops support for AIX/POWER, located in - src/google/protobuf/stubs/atomicops_internals_power.h. - This file is copyrighted by Bloomberg Finance LP. - -Copyright 2014, Google Inc. All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: - - * Redistributions of source code must retain the above copyright -notice, this list of conditions and the following disclaimer. - * 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. - * Neither the name of Google Inc. 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 COPYRIGHT -OWNER 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. - -Code generated by the Protocol Buffer compiler is owned by the owner -of the input file used when generating it. This code is not -standalone and requires a support library to be linked with it. This -support library is itself covered by the above license. diff --git a/packaging/opencv.spec b/packaging/opencv.spec index b797c21..72bab4c 100644 --- a/packaging/opencv.spec +++ b/packaging/opencv.spec @@ -7,9 +7,9 @@ Name: opencv Summary: OpenCV library Version: 4.7.0 -Release: 1 +Release: 2 Group: Development/Libraries -License: Apache-2.0 and BSD-3-Clause +License: Apache-2.0 Source0: %{name}-%{version}.tar.gz Source100: opencv-contrib-%{version}.tar.gz # In cmake/OpenCVDetectPython.cmake, python packages are installed @@ -306,7 +306,7 @@ fi %files %manifest opencv.manifest %defattr(-,root,root,-) -%license LICENSE LICENSE.BSD-3-Clause +%license LICENSE %{_libdir}/*.so* /usr/share/licenses/opencv4/* -- 2.7.4