Update package license

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

diff --git a/COPYING b/COPYING
new file mode 100755 (executable)
index 0000000..d8c7ce7
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,31 @@
+*******************************************************************************
+**     License
+*******************************************************************************
+
+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:
+
+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 the libjpeg-turbo Project 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 HOLDERS 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/packaging/libjpeg-turbo.spec b/packaging/libjpeg-turbo.spec
old mode 100644 (file)
new mode 100755 (executable)
index 0be24cb..62b8d70
--- a/packaging/libjpeg-turbo.spec
+++ b/packaging/libjpeg-turbo.spec
@@ -10,7 +10,7 @@ Name:           libjpeg-turbo
 Version:        %{srcver}
 Release:        0
 Summary:        A MMX/SSE2 accelerated library for manipulating JPEG image files
-License:        BSD-3-Clause
+License:        BSD-2.0
 Group:          Graphics & UI Framework/Libraries
 Url:            http://sourceforge.net/projects/libjpeg-turbo
 Source0:        http://downloads.sourceforge.net/project/%{name}/%{version}/%{name}-%{version}.tar.gz
@@ -65,16 +65,16 @@ cp %{SOURCE1001} .
 
 %build
 autoreconf -fiv
-%configure --disable-static \
-           --with-jpeg8
+%configure --enable-shared --disable-static --with-jpeg8
 make %{?_smp_mflags}
 
-%check
-make test libdir=%{_libdir}
+#%check
+#make test libdir=%{_libdir}
 
 %install
 %makeinstall
-
+mkdir -p %{buildroot}/usr/share/license
+cp -rf %{_builddir}/%{name}-%{srcver}/COPYING %{buildroot}/usr/share/license/%{name}
 # Fix perms
 chmod -x README-turbo.txt
 
@@ -86,6 +86,9 @@ rm %{buildroot}%{_bindir}/tjbench
 # Remove docs, we'll select docs manually
 rm -rf %{buildroot}%{_datadir}/doc/
 
+%clean
+rm -rf $RPM_BUILD_ROOT
+
 %post -n libjpeg -p /sbin/ldconfig
 
 %postun -n libjpeg -p /sbin/ldconfig
@@ -93,9 +96,9 @@ rm -rf %{buildroot}%{_datadir}/doc/
 %docs_package
 
 %files
+%{_datadir}/license/%{name}
 %manifest %{name}.manifest
 %defattr(-,root,root)
-%license README-turbo.txt
 %{_bindir}/*
 
 %files -n libjpeg
@@ -106,7 +109,6 @@ rm -rf %{buildroot}%{_datadir}/doc/
 %{_libdir}/libjpeg.so.%{major}
 
 %files -n libjpeg-devel
-%manifest %{name}.manifest
 %defattr(-,root,root)
 %{_includedir}/*.h
 %{_libdir}/libturbojpeg.so