[libjpeg-turbo] new upstream version 1.4.0 (#1180442)

[Petr Hracek]

commit dee567c707da480aa99fdc33c6f0129e2515b844
Author: Petr Hracek <phracek at redhat.com>
Date:   Tue Jan 20 13:07:28 2015 +0100

    new upstream version 1.4.0 (#1180442)
    
    Signed-off-by: Petr Hracek <phracek at redhat.com>

 jdmrg565.c                         |  355 ---------------
 libjpeg-turbo-JPP-FAR-macros.patch |   46 --
 libjpeg-turbo-second-arch.patch    |  874 ------------------------------------
 libjpeg-turbo.spec                 |   22 +-
 libjpeg-turbo12-noinst.patch       |    6 +-
 5 files changed, 12 insertions(+), 1291 deletions(-)
---
diff --git a/libjpeg-turbo.spec b/libjpeg-turbo.spec
index 8cdfb78..51525a6 100644
--- a/libjpeg-turbo.spec
+++ b/libjpeg-turbo.spec
@@ -1,17 +1,14 @@
 Name:           libjpeg-turbo
-Version:        1.3.90
-Release:        3%{?dist}
+Version:        1.4.0
+Release:        1%{?dist}
 Summary:        A MMX/SSE2 accelerated library for manipulating JPEG image files
 License:        IJG
 URL:            http://sourceforge.net/projects/libjpeg-turbo
 
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-Source1:        jdmrg565.c
-Patch0:         libjpeg-turbo12-noinst.patch
-Patch1:         libjpeg-turbo-header-files.patch
-Patch2:         libjpeg-turbo-second-arch.patch
-Patch3:         libjpeg-turbo-remove-test.patch
-Patch4:         libjpeg-turbo-JPP-FAR-macros.patch
+Patch0:		libjpeg-turbo12-noinst.patch
+Patch1:		libjpeg-turbo-header-files.patch
+Patch2:		libjpeg-turbo-remove-test.patch
 
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -78,11 +75,7 @@ manipulate JPEG files using the TurboJPEG library.
 %setup -q
 %patch0 -p1 -b .noinst
 %patch1 -p1 -b .header-files
-%patch2 -p1 -b .second-arch
-%patch3 -p1 -b .remove-test
-%patch4 -p1 -b .JPP-FAR-macros
-
-cp %SOURCE1 .
+%patch2 -p1 -b .remove-test
 
 %build
 autoreconf -fiv
@@ -139,6 +132,9 @@ make test
 %{_libdir}/libturbojpeg.so
 
 %changelog
+* Tue Jan 20 2015 Petr Hracek <phracek at redhat.com> - 1.4.0-1
+- new upstream version 1.4.0 (#1180442)
+
 * Wed Nov 26 2014 Petr Hracek <phracek at redhat.com> - 1.3.90-3
 - libjpeg-turbo no longer defined macros like JPP (#1164815)
 
diff --git a/libjpeg-turbo12-noinst.patch b/libjpeg-turbo12-noinst.patch
index 4c06d30..db9db35 100644
--- a/libjpeg-turbo12-noinst.patch
+++ b/libjpeg-turbo12-noinst.patch
@@ -1,5 +1,5 @@
 diff --git a/Makefile.am b/Makefile.am
-index 1aeb5dd..d767e4f 100644
+index b32a41b..1758e5f 100644
 --- a/Makefile.am
 +++ b/Makefile.am
 @@ -90,9 +90,7 @@ noinst_PROGRAMS = jcstest
@@ -9,7 +9,7 @@ index 1aeb5dd..d767e4f 100644
 -bin_PROGRAMS += tjbench
 -
 -noinst_PROGRAMS += tjunittest
-+noinst_PROGRAMS += tjbench tjunittest
++noinst_PROGRAMS += tjbench tjunittest 
  
  tjbench_SOURCES = tjbench.c bmp.h bmp.c tjutil.h tjutil.c rdbmp.c rdppm.c \
  	wrbmp.c wrppm.c
@@ -27,4 +27,4 @@ index 1aeb5dd..d767e4f 100644
 -
  EXTRA_DIST = win release $(DOCS) testimages CMakeLists.txt \
  	sharedlib/CMakeLists.txt cmakescripts libjpeg.map.in doc doxygen.config \
- 	doxygen-extra.css jccolext.c jdcolext.c jdcol565.c jdmrgext.c jstdhuff.c
+ 	doxygen-extra.css jccolext.c jdcolext.c jdcol565.c jdmrgext.c jdmrg565.c \