From: Andreas Schwab <aschwab@redhat.com>
Date: Wed, 17 Jun 2009 12:11:06 +0000 (+0200)
Subject: Correct handling of glibc-libidn tarball.
X-Git-Tag: fedora/glibc-2.10.1-3~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9d1b9fcafd89cae0d4010d22d5bbc8be69b59cd1;p=thirdparty%2Fglibc.git

Correct handling of glibc-libidn tarball.
---

diff --git a/fedora/glibc.spec.in b/fedora/glibc.spec.in
index 7c22a902f45..413466eb4d6 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"