From 9fb92a17f57b64663d64170720b52ff9a7a247ed Mon Sep 17 00:00:00 2001 From: Petr Hracek Date: Mon, 27 Oct 2014 16:15:58 +0100 Subject: [PATCH] Resolves #1135375 - new upstream version 1.3.90 --- libjpeg-turbo-header-files.patch | 2 +- libjpeg-turbo.spec | 8 ++++++-- libjpeg-turbo12-noinst.patch | 10 +++++----- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/libjpeg-turbo-header-files.patch b/libjpeg-turbo-header-files.patch index 95b7a31..e55058a 100644 --- a/libjpeg-turbo-header-files.patch +++ b/libjpeg-turbo-header-files.patch @@ -1,5 +1,5 @@ diff --git a/Makefile.am b/Makefile.am -index c8e8b93..0496879 100644 +index d767e4f..584d0c0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ diff --git a/libjpeg-turbo.spec b/libjpeg-turbo.spec index d3509ee..fba44da 100644 --- a/libjpeg-turbo.spec +++ b/libjpeg-turbo.spec @@ -1,6 +1,6 @@ Name: libjpeg-turbo -Version: 1.3.1 -Release: 4%{?dist} +Version: 1.3.90 +Release: 1%{?dist} Summary: A MMX/SSE2 accelerated library for manipulating JPEG image files License: IJG URL: http://sourceforge.net/projects/libjpeg-turbo @@ -130,6 +130,10 @@ make test %{_libdir}/libturbojpeg.so %changelog +* Mon Oct 27 2014 Petr Hracek - 1.3.90-1 +- new upstream version 1.3.90 +Resolves #1135375 + * Sun Aug 17 2014 Fedora Release Engineering - 1.3.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild diff --git a/libjpeg-turbo12-noinst.patch b/libjpeg-turbo12-noinst.patch index 25bed87..4c06d30 100644 --- a/libjpeg-turbo12-noinst.patch +++ b/libjpeg-turbo12-noinst.patch @@ -1,8 +1,8 @@ diff --git a/Makefile.am b/Makefile.am -index ade5034..d2fced9 100644 +index 1aeb5dd..d767e4f 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -89,9 +89,7 @@ noinst_PROGRAMS = jcstest +@@ -90,9 +90,7 @@ noinst_PROGRAMS = jcstest if WITH_TURBOJPEG @@ -13,13 +13,13 @@ index ade5034..d2fced9 100644 tjbench_SOURCES = tjbench.c bmp.h bmp.c tjutil.h tjutil.c rdbmp.c rdppm.c \ wrbmp.c wrppm.c -@@ -144,14 +142,6 @@ dist_man1_MANS = cjpeg.1 djpeg.1 jpegtran.1 rdjpgcom.1 wrjpgcom.1 +@@ -158,14 +156,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.txt \ ChangeLog.txt -docdir = $(datadir)/doc -dist_doc_DATA = README README-turbo.txt libjpeg.txt structure.txt usage.txt \ -- wizard.txt +- wizard.txt - -exampledir = $(datadir)/doc -dist_example_DATA = example.c @@ -27,4 +27,4 @@ index ade5034..d2fced9 100644 - EXTRA_DIST = win release $(DOCS) testimages CMakeLists.txt \ sharedlib/CMakeLists.txt cmakescripts libjpeg.map.in doc doxygen.config \ - jccolext.c jdcolext.c jdmrgext.c + doxygen-extra.css jccolext.c jdcolext.c jdcol565.c jdmrgext.c jstdhuff.c