- fix arch dependant build

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

diff --git a/libjpeg-turbo.spec b/libjpeg-turbo.spec
index bd6b31c6e268449a076b339a65819f362cb0e120..3cd49680eb89f4fa13f460721d441575badc2e51 100644 (file)
--- a/libjpeg-turbo.spec
+++ b/libjpeg-turbo.spec
@@ -4,16 +4,16 @@
 %bcond_without java    # Java binding
 #
 %define                libjpeg_ver     8c
+%define                libjpeg_ver_lt  9-1
 Summary:       A MMX/SSE2 accelerated library for manipulating JPEG image files
 Summary(pl.UTF-8):     Biblioteka do obróbki plików obrazów JPEG z akceleracją MMX/SSE2
 Name:          libjpeg-turbo
-Version:       1.2.1
+Version:       1.3.1
 Release:       1
 License:       wxWidgets
 Group:         Libraries
 Source0:       http://downloads.sourceforge.net/libjpeg-turbo/%{name}-%{version}.tar.gz
-# Source0-md5: f61e60ff01381ece4d2fe65eeb52669e
-Patch0:                %{name}-turbojpeg.patch
+# Source0-md5: 2c3a68129dac443a72815ff5bb374b05
 URL:           http://libjpeg-turbo.virtualgl.org/
 BuildRequires: autoconf >= 2.56
 BuildRequires: automake
@@ -25,7 +25,8 @@ BuildRequires:        libtool
 BuildRequires: nasm
 %endif
 Provides:      libjpeg = %{libjpeg_ver}
-Obsoletes:     libjpeg >= %{libjpeg_ver}
+Obsoletes:     libjpeg < %{libjpeg_ver_lt}
+Obsoletes:     libjpegsimd
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -35,7 +36,7 @@ compression/decompression by about 2-4x on x86 and x86-64 platforms.
 It is based on libjpeg/SIMD but has numerous enhancements.
 
 %description -l pl.UTF-8
-libjpeg-turbo to wersja biblioteki libjpeg, wykorzystująca instrukcje
+libjpeg-turbo to wersja biblioteki libjpeg wykorzystująca instrukcje
 SIMD MMX, SSE i SSE2 w celu przyspieszenia kompresji/dekompresji JPEG
 o około 2-4 razy na platformach x86 i x86-64. Jest oparta na
 libjpeg/SIMD, ale ma wiele rozszerzeń.
@@ -46,7 +47,8 @@ Summary(pl.UTF-8):    Pliki nagłówkowe do tworzenia programów przy użyciu libjp
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
 Provides:      libjpeg-devel = %{libjpeg_ver}
-Obsoletes:     libjpeg-devel >= %{libjpeg_ver}
+Obsoletes:     libjpeg-devel < %{libjpeg_ver_lt}
+Obsoletes:     libjpegsimd-devel
 Conflicts:     libjpeg6-devel
 
 %description devel
@@ -96,7 +98,8 @@ Summary(uk.UTF-8):    Статична бібліотека для програму
 Group:         Development/Libraries
 Requires:      %{name}-devel = %{version}-%{release}
 Provides:      libjpeg-static = %{libjpeg_ver}
-Obsoletes:     libjpeg-static >= %{libjpeg_ver}
+Obsoletes:     libjpeg-static < %{libjpeg_ver_lt}
+Obsoletes:     libjpegsimd-static
 Conflicts:     libjpeg-turbo6-static
 
 %description static
@@ -124,7 +127,8 @@ Summary(pl.UTF-8):  Kilka prostych programów do manipulowania na plikach JPEG
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
 Provides:      libjpeg-progs = %{libjpeg_ver}
-Obsoletes:     libjpeg-progs >= %{libjpeg_ver}
+Obsoletes:     libjpeg-progs < %{libjpeg_ver_lt}
+Obsoletes:     libjpegsimd-progs
 Conflicts:     libjpeg-turbo6-progs
 
 %description progs
@@ -163,7 +167,6 @@ Interfejs Javy do biblioteki TurboJPEG/OSS.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %{__libtoolize}
@@ -176,9 +179,12 @@ Interfejs Javy do biblioteki TurboJPEG/OSS.
        --enable-shared \
        --enable-static \
        %{?with_java:--with-java} \
+%ifnarch %{ix86} %{x8664}
+       --without-simd \
+%endif
        --with-jpeg8
 
-%{__make}
+%{__make} -j1
 
 %{?with_tests:%{__make} test}
 
@@ -190,7 +196,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %if %{with java}
 install -d $RPM_BUILD_ROOT%{_javadir}
-%{__mv} $RPM_BUILD_ROOT%{_prefix}/classes/turbojpeg.jar $RPM_BUILD_ROOT%{_javadir}
+%{__mv} $RPM_BUILD_ROOT%{_datadir}/classes/turbojpeg.jar $RPM_BUILD_ROOT%{_javadir}
 %endif
 
 %clean