add R: %{_libdir}/gconv for 32bit iconv on 64bit systems

[packages/acroread.git] / acroread.spec

diff --git a/acroread.spec b/acroread.spec
index 46099eecdfdf5b3755b3cc6921c1e21ccf27a0c4..3a45dce7ad2a829710f2074218980a7582cf371b 100644 (file)
--- a/acroread.spec
+++ b/acroread.spec
@@ -13,7 +13,7 @@ Name:         %{base_name}
 %else
 Name:          %{base_name}-installer
 %endif
-Version:       9.5.1
+Version:       9.5.5
 Release:       %{rel}%{?with_license_agreement:wla}
 Epoch:         1
 License:       distribution restricted (http://www.adobe.com/products/acrobat/distribute.html)
@@ -23,7 +23,7 @@ License:      distribution restricted (http://www.adobe.com/products/acrobat/distribu
 Group:         X11/Applications/Graphics
 %if %{with license_agreement}
 Source0:       ftp://ftp.adobe.com/pub/adobe/reader/unix/9.x/%{version}/enu/AdbeRdr%{version}-1_i486linux_enu.tar.bz2
-# NoSource0-md5:       e753016e8f11cdeaabcc576a7a320af3
+# NoSource0-md5:       664d546fbf0ad91f20dcf3753b0a2684
 NoSource:      0
 %else
 Source1:       http://svn.pld-linux.org/svn/license-installer/license-installer.sh
@@ -35,6 +35,8 @@ Source3:      %{base_name}.png
 URL:           http://www.adobe.com/products/acrobat/
 %if %{with license_agreement}
 BuildRequires: rpmbuild(macros) >= 1.357
+# to force 32bit iconv
+Requires:      %{_libdir}/gconv
 Requires:      ca-certificates >= 20080809-4
 Requires:      iconv
 Requires:      openldap-libs < 2.5
@@ -53,9 +55,12 @@ BuildRoot:   %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _noautostrip    .*\.api
 %define                _noautoprov     libcrypto\.so.* libssl\.so.* libcurl\.so.* libicu.* libstdc++\.so.* libgcc_s\.so.*
+%if "%{_rpmversion}" >= "5.0"
+%define                _noautoreq      %{_noautoprov} '^lib.*\.so$' '^lib.*\\(VERSION\\)$'
+%else
 %define                _noautoreq      %{_noautoprov} '^lib.*\.so$' '^lib.*\(VERSION\)$'
+%endif
 %define         no_install_post_check_so        1
-%define                skip_post_check_so libWRServices.so.3.1 libadobelinguistic.so.3.2.0 libauthplay.so.0.0.0
 
 %description
 Adobe(R) Reader(R) is free software that lets you view and print PDF