Release 2 (by relup.sh)

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

diff --git a/libjpeg-turbo.spec b/libjpeg-turbo.spec
index 2c93ef37f89d0ddcc42b490f827a180659d05ecb..413b4abcc5b8965803e2ce42d416ac52fb341d4e 100644 (file)
--- a/libjpeg-turbo.spec
+++ b/libjpeg-turbo.spec
@@ -5,24 +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.0.6
-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: 4cada3f0bdc93d826fa31bf9e4469ef6
+# Source0-md5: 3241b54016c445e5d8f0ebb0ad9294ed
+Patch0:                %{name}-x32-java.patch
 URL:           https://libjpeg-turbo.org/
-BuildRequires: cmake >= 2.8.12
-%{?with_java:BuildRequires:    jdk}
+BuildRequires: cmake >= 3.9.0
+%{?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
@@ -168,13 +172,15 @@ Interfejs Javy do biblioteki TurboJPEG/OSS.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
+export JAVA_HOME="%{java_home}"
 install -d build
 cd build
 %cmake .. \
        %{?with_java:-DWITH_JAVA=ON} \
-%ifnarch %{ix86} %{x8664} %{arm} aarch64 ppc
+%ifnarch %{ix86} %{x8664} x32 %{arm} aarch64 ppc
        -DWITH_SIMD=OFF \
 %endif
        -DWITH_JPEG8=ON
@@ -189,6 +195,9 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} -C build install \
        DESTDIR=$RPM_BUILD_ROOT
 
+# disable completeness check incompatible with split packaging
+%{__sed} -i -e '/^foreach(target .*IMPORT_CHECK_TARGETS/,/^endforeach/d; /^unset(_IMPORT_CHECK_TARGETS)/d' $RPM_BUILD_ROOT%{_libdir}/cmake/libjpeg-turbo/libjpeg-turboTargets.cmake
+
 # packaged as %doc
 %{__rm} $RPM_BUILD_ROOT%{_docdir}/{LICENSE.md,README.{ijg,md},%{?with_java:TJExample.java,}example.txt,libjpeg.txt,structure.txt,tjexample.c,usage.txt,wizard.txt}
 
@@ -218,6 +227,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/turbojpeg.h
 %{_pkgconfigdir}/libjpeg.pc
 %{_pkgconfigdir}/libturbojpeg.pc
+%{_libdir}/cmake/libjpeg-turbo
 
 %files static
 %defattr(644,root,root,755)