From c83351d12004e8fef10a7b04f551d70c957151dd Mon Sep 17 00:00:00 2001
From: Petr Hracek <phracek@redhat.com>
Date: Mar 15 2016 11:07:36 +0000
Subject: New upstream release 1.4.90 (#1313111)


Signed-off-by: Petr Hracek <phracek@redhat.com>

---

diff --git a/libjpeg-turbo.spec b/libjpeg-turbo.spec
index dfe3949..c89a6a8 100644
--- a/libjpeg-turbo.spec
+++ b/libjpeg-turbo.spec
@@ -1,6 +1,6 @@
 Name:           libjpeg-turbo
-Version:        1.4.2
-Release:        3%{?dist}
+Version:        1.4.90
+Release:        1%{?dist}
 Summary:        A MMX/SSE2 accelerated library for manipulating JPEG image files
 License:        IJG
 URL:            http://sourceforge.net/projects/libjpeg-turbo
@@ -82,7 +82,7 @@ make install DESTDIR=%{buildroot}
 find %{buildroot} -name "*.la" -delete
 
 # Fix perms
-chmod -x README-turbo.txt
+chmod -x README.md
 
 # multilib header hack
 # we only apply this to known Red Hat multilib arches, per bug #1264675
@@ -132,7 +132,7 @@ make test %{?_smp_mflags}
 %postun -n turbojpeg -p /sbin/ldconfig
 
 %files
-%doc README README-turbo.txt ChangeLog.txt
+%doc README.md README.ijg ChangeLog.txt
 %{_libdir}/libjpeg.so.62*
 
 %files devel
@@ -143,6 +143,7 @@ make test %{?_smp_mflags}
 %{_includedir}/jpegint.h
 %{_includedir}/jpeglib.h
 %{_libdir}/libjpeg.so
+%{_libdir}/pkgconfig/libjpeg.pc
 
 %files utils
 %doc usage.txt wizard.txt
@@ -163,8 +164,12 @@ make test %{?_smp_mflags}
 %files -n turbojpeg-devel
 %{_includedir}/turbojpeg.h
 %{_libdir}/libturbojpeg.so
+%{_libdir}/pkgconfig/libturbojpeg.pc
 
 %changelog
+* Thu Mar 10 2016 Petr Hracek <phracek@redhat.com> - 1.4.90-1
+- New upstream release 1.4.90 (#1313111)
+
 * Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
 
diff --git a/libjpeg-turbo14-noinst.patch b/libjpeg-turbo14-noinst.patch
index c7631bb..2a46cf6 100644
--- a/libjpeg-turbo14-noinst.patch
+++ b/libjpeg-turbo14-noinst.patch
@@ -1,6 +1,8 @@
---- libjpeg-turbo-1.4.1/Makefile.am.orig	2015-06-16 19:23:23.866620985 +0100
-+++ libjpeg-turbo-1.4.1/Makefile.am	2015-06-16 19:26:38.070227353 +0100
-@@ -90,9 +90,7 @@
+diff --git a/Makefile.am b/Makefile.am
+index b29edde..ceeb8b6 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -92,9 +92,7 @@ noinst_PROGRAMS = jcstest
  
  if WITH_TURBOJPEG
  
@@ -11,12 +13,12 @@
  
  tjbench_SOURCES = tjbench.c bmp.h bmp.c tjutil.h tjutil.c rdbmp.c rdppm.c \
  	wrbmp.c wrppm.c
-@@ -158,13 +156,6 @@
- DOCS= coderules.txt jconfig.txt change.log rdrle.c wrrle.c BUILDING.txt \
+@@ -160,13 +158,6 @@ dist_man1_MANS = cjpeg.1 djpeg.1 jpegtran.1 rdjpgcom.1 wrjpgcom.1
+ DOCS= coderules.txt jconfig.txt change.log rdrle.c wrrle.c BUILDING.md \
  	ChangeLog.txt
  
--dist_doc_DATA = README README-turbo.txt libjpeg.txt structure.txt usage.txt \
--	wizard.txt
+-dist_doc_DATA = README.ijg README.md libjpeg.txt structure.txt usage.txt \
+-	wizard.txt LICENSE.md
 -
 -exampledir = $(docdir)
 -dist_example_DATA = example.c