From ce6a278482f79dc52d0305e45de144d5e598568a Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Wed, 17 Jun 2009 14:11:06 +0200 Subject: Correct handling of glibc-libidn tarball. --- fedora/glibc.spec.in | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/fedora/glibc.spec.in b/fedora/glibc.spec.in index 7c22a902f4..413466eb4d 100644 --- a/fedora/glibc.spec.in +++ b/fedora/glibc.spec.in @@ -31,10 +31,10 @@ Group: System Environment/Libraries URL: http://sources.redhat.com/glibc/ Source0: %{?glibc_release_url}%{glibcsrcdir}.tar.bz2 %if 0%{?glibc_release_url:1} -%define glibc_libidn_tarball %(echo %{glibcsrcdir} | \ - sed s/glibc-/glibc-libidn-/).tar.bz2 -Source1: %{glibc_release_url}%{glibc_libidn_tarball} +%define glibc_libidn_srcdir %(echo %{glibcsrcdir} | sed s/glibc-/glibc-libidn-/) +Source1: %{glibc_release_url}%{glibc_libidn_srcdir}.tar.bz2 %define glibc_release_unpack -a1 +%define glibc_release_setup mv %{glibc_libidn_srcdir} libidn %endif Source2: %{glibcsrcdir}-fedora.tar.bz2 Patch0: %{name}-fedora.patch @@ -224,6 +224,7 @@ package or when debugging this package. %prep %setup -q -n %{glibcsrcdir} %{?glibc_release_unpack} -b2 +%{?glibc_release_setup} %patch0 -E -p1 %ifarch ia64 %if "%{_lib}" == "lib64" -- cgit v1.2.3