No longer try to use separate libidn addon

diff --git a/fedora/Makefile b/fedora/Makefile
index 51df058f2263ec393d7f32b407177d6ca65124a6..5fb82a76f86356e1ba8ba88f50e7569cd723942b 100644 (file)
--- a/fedora/Makefile
+++ b/fedora/Makefile
@@ -121,8 +121,7 @@ $(tar-name)-$(branch-name).tar.bz2: glibc.spec Makefile
 $(tar-name).tar.bz2: $(dep-upstream-branch) Makefile
        @if $(upstream-pristine); then \
           echo 'Fetching from $(releases-url)...'; \
-          curl $(addprefix -C - -O $(releases-url),\
-                           $@ $(@:glibc-%=glibc-libidn-%)); \
+          curl -C - -O $(releases-url)/$@; \
         else \
           $(call git-tar,$(merge-base-id)); \
         fi

diff --git a/fedora/glibc.spec.in b/fedora/glibc.spec.in
index c28feb9471185ecd164e2a7841185c72c09d3834..f8dd34edbe5e3813180973691e49cea990c64123 100644 (file)
--- a/fedora/glibc.spec.in
+++ b/fedora/glibc.spec.in
@@ -30,13 +30,7 @@ License: LGPLv2+ and LGPLv2+ with exceptions and GPLv2+
 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_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
+Source1: %{glibcsrcdir}-fedora.tar.bz2
 Patch0: %{name}-fedora.patch
 Patch1: %{name}-ia64-lib64.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -223,8 +217,7 @@ package or when debugging this package.
 %endif
 
 %prep
-%setup -q -n %{glibcsrcdir} %{?glibc_release_unpack} -b2
-%{?glibc_release_setup}
+%setup -q -n %{glibcsrcdir} -b1
 %patch0 -E -p1
 %ifarch ia64
 %if "%{_lib}" == "lib64"