- AMD64 fixes

Changed files:
    expect.spec -> 1.54

diff --git a/expect.spec b/expect.spec
index 5a10f8c081269d9a9f5e49eb9a5b0692defe2b60..9fef5dda7edeb8acd9c81573abf46ab9a2bac0aa 100644 (file)
--- a/expect.spec
+++ b/expect.spec
@@ -19,6 +19,7 @@ Patch2:               %{name}-bug7869.patch
 Patch3:                %{name}-fixcat.patch
 Patch4:                %{name}-jbj.patch
 Patch5:                %{name}-soname.patch
+Patch6:                %{name}-lib64.patch
 Icon:          tcl.gif
 URL:           http://expect.nist.gov/
 BuildRequires: autoconf
@@ -27,6 +28,8 @@ BuildRequires:        tcl-devel >= 8.4.4
 BuildRequires: tk-devel >= 8.4.3
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define        _ulibdir        /usr/lib
+
 %description
 Expect is a tool for automating interactive applications such as
 telnet, ftp, passwd, fsck, rlogin, tip, etc. It makes it easy for a
@@ -111,6 +114,9 @@ Biblioteka statyczna rozszerzenia j
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%ifarch amd64
+%patch6 -p1
+%endif
 
 chmod +w {.,testsuite}/configure
 
@@ -126,8 +132,8 @@ cd -
 %configure \
        --enable-gcc \
        --enable-shared \
-       --with-tclconfig=%{_libdir} \
-       --with-tkconfig=%{_libdir} \
+       --with-tclconfig=%{_ulibdir} \
+       --with-tkconfig=%{_ulibdir} \
        --with-tclinclude=%{_includedir} \
        --with-tkinclude=%{_includedir}