Fix PowerPC 32-bit RPM build

diff --git a/configure.ac b/configure.ac
index 3b0151c0709ce7dc55c5631afc57ec5076b4ce72..92a65ffc776f03f0dfb2c9071ea3cb1a8f7c4798 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -565,6 +565,10 @@ case "$host_cpu" in
     RPMARCH=`uname -m`
     DEBARCH=ppc64el
     ;;
+  powerpc)
+    RPMARCH=ppc
+    DEBARCH=ppc
+    ;;
   *)
     RPMARCH=`uname -m`
     DEBARCH=$RPMARCH

diff --git a/release/libjpeg-turbo.spec.in b/release/libjpeg-turbo.spec.in
index 8ba87c7d93e8bb4ae2cf01b04218175f7b9deb44..e4e4b9c02d928e36840de54c50a933b18943fc26 100644 (file)
--- a/release/libjpeg-turbo.spec.in
+++ b/release/libjpeg-turbo.spec.in
@@ -13,7 +13,18 @@
 # Path under which headers should be installed
 %define _includedir %{__includedir}
 
-%ifarch x86_64
+%if "%{?__isa_bits:1}" == "1"
+%define _bits %{__isa_bits}
+%else
+# RPM < 4.6
+%if "%{_lib}" == "lib64"
+%define _bits 64
+%else
+%define _bits 32
+%endif
+%endif
+
+%if "%{_bits}" == "64"
 %define _libdir %{_exec_prefix}/lib64
 %else
 %if "%{_prefix}" == "/opt/libjpeg-turbo"
@@ -35,7 +46,7 @@ Release: @BUILD@
 License: BSD-style
 BuildRoot: %{_blddir}/%{name}-buildroot-%{version}-%{release}
 Prereq: /sbin/ldconfig
-%ifarch x86_64
+%if "%{_bits}" == "64"
 Provides: %{name} = %{version}-%{release}, @PACKAGE_NAME@ = %{version}-%{release}, libturbojpeg.so()(64bit)
 %else
 Provides: %{name} = %{version}-%{release}, @PACKAGE_NAME@ = %{version}-%{release}, libturbojpeg.so