diff options
| author | Andreas Schwab <schwab@redhat.com> | 2009-11-02 15:45:40 +0100 |
|---|---|---|
| committer | Andreas Schwab <schwab@redhat.com> | 2009-11-16 18:07:26 +0100 |
| commit | ed26dd532e36429cbc6e60ae3be41719be9a5b89 (patch) | |
| tree | 08114d566b8057ef04ca946484c9706ebe680daf | |
| parent | b049214c5e4e0b3d4d4e3aee4f67dbab659ab890 (diff) | |
No longer try to use separate libidn addon
| -rw-r--r-- | fedora/Makefile | 3 | ||||
| -rw-r--r-- | fedora/glibc.spec.in | 11 |
2 files changed, 3 insertions, 11 deletions
diff --git a/fedora/Makefile b/fedora/Makefile index 51df058f22..5fb82a76f8 100644 --- 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 c28feb9471..f8dd34edbe 100644 --- 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" |