- AMD64 fixes

Changed files:
    erlang.spec -> 1.8

diff --git a/erlang.spec b/erlang.spec
index 6bc2e2406191ffd2f365369b0e514950b923217e..86289773ecd4823e9eb0575cfba6ef31e5a3b318 100644 (file)
--- a/erlang.spec
+++ b/erlang.spec
@@ -2,7 +2,7 @@ Summary:        OpenSource Erlang/OTP
 Summary(pl):   Erlang/OTP z otwartymi ¼ród³ami
 Name:          erlang
 Version:       R9C_2
 Summary(pl):   Erlang/OTP z otwartymi ¼ród³ami
 Name:          erlang
 Version:       R9C_2

-Release:       0.1
+Release:       1

 Epoch:         1
 License:       distributable
 Group:         Development/Languages
 Epoch:         1
 License:       distributable
 Group:         Development/Languages


@@ -11,9 +11,11 @@ Source0:     http://www.erlang.org/download/otp_src_%{_version}.tar.gz
 # Source0-md5: 3cdb1c58671995d6b334e0f8da414816
 Source1:       http://www.erlang.org/download/otp_man_R9C-0.tar.gz
 # Source1-md5: f94bbaba800cc73e67704b92df5aab60
 # Source0-md5: 3cdb1c58671995d6b334e0f8da414816
 Source1:       http://www.erlang.org/download/otp_man_R9C-0.tar.gz
 # Source1-md5: f94bbaba800cc73e67704b92df5aab60

+Patch0:                %{name}-fPIC.patch

 URL:           http://www.erlang.org/
 BuildRequires: XFree86-devel
 BuildRequires: autoconf
 URL:           http://www.erlang.org/
 BuildRequires: XFree86-devel
 BuildRequires: autoconf

+BuildRequires: automake

 BuildRequires: flex
 BuildRequires: perl-base
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 BuildRequires: flex
 BuildRequires: perl-base
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)


@@ -31,8 +33,10 @@ rozpowszechnianiu Erlanga poza Ericssonem.
 %prep
 %setup -q -n otp_src_%{_version}
 %{__tar} xzf %{SOURCE1} man/ COPYRIGHT
 %prep
 %setup -q -n otp_src_%{_version}
 %{__tar} xzf %{SOURCE1} man/ COPYRIGHT

+%patch0 -p1

 
 %build
 
 %build

+find . -name config.sub | xargs -n 1 cp -f /usr/share/automake/config.sub

 %{__autoconf}
 cd lib
 %{__autoconf}
 %{__autoconf}
 cd lib
 %{__autoconf}


@@ -50,13 +54,13 @@ cd ..
 %configure
 ERL_TOP=`pwd`; export ERL_TOP
 %{__make} \
 %configure
 ERL_TOP=`pwd`; export ERL_TOP
 %{__make} \

-       TARGET="%{_build}"
+       TARGET="%(echo %{_build} | sed -e's/amd64/x86_64/')"

 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \

-       TARGET="%{_build}" \
+       TARGET="%(echo %{_build} | sed -e's/amd64/x86_64/')" \

        INSTALL_PREFIX=$RPM_BUILD_ROOT
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/erts-*/*.html
        INSTALL_PREFIX=$RPM_BUILD_ROOT
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/erts-*/*.html