Release 2 (by relup.sh)

[packages/libjpeg-turbo.git] / libjpeg-turbo.spec

diff --git a/libjpeg-turbo.spec b/libjpeg-turbo.spec
index 062cec67c163ef1ce72deecc61051e9f8a3f3d07..413b4abcc5b8965803e2ce42d416ac52fb341d4e 100644 (file)
--- a/libjpeg-turbo.spec
+++ b/libjpeg-turbo.spec
@@ -5,26 +5,28 @@
 #
 %define                libjpeg_ver     8c
 %define                libjpeg_ver_lt  9-1
+%define                use_jdk         openjdk8
 Summary:       SIMD accelerated library for manipulating JPEG image files
 Summary(pl.UTF-8):     Biblioteka do obróbki plików obrazów JPEG z akceleracją SIMD
 Name:          libjpeg-turbo
-Version:       2.1.3
-Release:       1
+Version:       2.1.4
+Release:       2
 # more specifically: IJG, modified-BSD or Zlib
 License:       BSD-like
 Group:         Libraries
 Source0:       https://downloads.sourceforge.net/libjpeg-turbo/%{name}-%{version}.tar.gz
-# Source0-md5: 85244dedeaf06f636a9e7ddea6d236d8
+# Source0-md5: 3241b54016c445e5d8f0ebb0ad9294ed
 Patch0:                %{name}-x32-java.patch
 URL:           https://libjpeg-turbo.org/
 BuildRequires: cmake >= 3.9.0
-%{?with_java:BuildRequires:    jdk}
-%{?with_java:BuildRequires:    jre-X11}
+%{?with_java:%buildrequires_jdk}
+%{?with_java:BuildRequires:    openjdk8-jre-base-X11}
 BuildRequires: libstdc++-devel
 # x86* SIMD code uses NASM; ARM and MIPS use gas, PowerPC uses gcc intrinsics, no SIMD code for other archs
 %ifarch %{ix86} %{x8664}
 BuildRequires: nasm
 %endif
+BuildRequires: rpmbuild(macros) >= 1.605
 Provides:      libjpeg = %{libjpeg_ver}
 Obsoletes:     libjpeg < %{libjpeg_ver_lt}
 Obsoletes:     libjpegsimd < 7
@@ -173,6 +175,7 @@ Interfejs Javy do biblioteki TurboJPEG/OSS.
 %patch0 -p1
 
 %build
+export JAVA_HOME="%{java_home}"
 install -d build
 cd build
 %cmake .. \