From: Jiyong Min <jiyong.min@samsung.com>
Date: Wed, 27 Sep 2017 01:45:09 +0000 (+0900)
Subject: Modify libjpeg-turbo license
X-Git-Tag: submit/tizen/20171127.045258~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F89%2F152689%2F2;p=platform%2Fupstream%2Flibjpeg-turbo.git

Modify libjpeg-turbo license

Change-Id: I29a7c9bc962b99df48e3de011416d6a047655b62
Signed-off-by: Jiyong Min <jiyong.min@samsung.com>
---

diff --git a/COPYING b/COPYING
index d8c7ce7..2f0eaab 100755
--- a/COPYING
+++ b/COPYING
@@ -1,10 +1,8 @@
-*******************************************************************************
-**     License
-*******************************************************************************
+This software is based in part on the work of the Independent JPEG Group.
 
-Most of libjpeg-turbo inherits the non-restrictive, BSD-style license used by
-libjpeg (see README.)  The TurboJPEG/OSS wrapper (both C and Java versions) and
-associated test programs bear a similar license, which is reproduced below:
+
+
+Copyright (C) 2009-2015 D. R. Commander.  All Rights Reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
@@ -29,3 +27,14 @@ 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.
+
+
+
+Copyright (C) 1988-1989 by Jef Poskanzer.
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted, provided
+that the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.  This software is provided "as is" without express or
+implied warranty.
diff --git a/packaging/libjpeg-turbo.spec b/packaging/libjpeg-turbo.spec
index 5dda1f8..f9d629b 100755
--- a/packaging/libjpeg-turbo.spec
+++ b/packaging/libjpeg-turbo.spec
@@ -10,7 +10,7 @@ Name:           libjpeg-turbo
 Version:        %{srcver}
 Release:        1
 Summary:        A MMX/SSE2 accelerated library for manipulating JPEG image files
-License:        BSD-3-Clause
+License:        BSD License (BSD 3-clause, Historic Permission Notice and Disclaimer, libjpeg License)
 Group:          Graphics & UI Framework/Libraries
 Url:            http://sourceforge.net/projects/libjpeg-turbo
 Source0:        http://downloads.sourceforge.net/project/%{name}/%{version}/%{name}-%{version}.tar.gz