Correct handling of glibc-libidn tarball.

diff --git a/fedora/glibc.spec.in b/fedora/glibc.spec.in
index 7c22a902f455179af2eb43da53f6e0f7b827f551..413466eb4d6de7ed8154fdc614bb24f4b59eda72 100644 (file)
--- 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"