From: Andreas Schwab <schwab@redhat.com>
Date: Tue, 27 Jul 2010 12:20:02 +0000 (+0200)
Subject: Switch to xz compressed tar files
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=070e0ca0f39a82331879639b1f51f108eb28004d;p=thirdparty%2Fglibc.git

Switch to xz compressed tar files
---

diff --git a/fedora/Makefile b/fedora/Makefile
index e09c369c022..297fd596005 100644
--- a/fedora/Makefile
+++ b/fedora/Makefile
@@ -131,21 +131,21 @@ ports-git-describe = $(GIT-ports) describe --long --always
 define git-tar
 echo "Creating $@ from `$(git-describe) $1`..."; \
 (cd ..; $(GIT) archive --format=tar --prefix='$(tar-name)/' $1 $2) \
-| bzip2 -9 > $@.new && \
+| xz -9 > $@.new && \
 mv -f $@.new $@
 endef
 
 define ports-git-tar
 echo "Creating $@ from `$(ports-git-describe) $1`..."; \
 (cd ..; $(GIT-ports) archive --format=tar --prefix='$(ports-tar-name)/' $1 $2) \
-| bzip2 -9 > $@.new && \
+| xz -9 > $@.new && \
 mv -f $@.new $@
 endef
 
-$(tar-name)-$(branch-name).tar.bz2: glibc.spec Makefile
+$(tar-name)-$(branch-name).tar.xz: glibc.spec Makefile
 	@$(call git-tar,$(my-branch),$(outside-patch))
 
-$(tar-name).tar.bz2: $(dep-upstream-branch) Makefile
+$(tar-name).tar.xz: $(dep-upstream-branch) Makefile
 	@if $(upstream-pristine); then \
 	   echo 'Fetching from $(releases-url)...'; \
 	   curl -C - -O $(releases-url)/$@; \
@@ -153,7 +153,7 @@ $(tar-name).tar.bz2: $(dep-upstream-branch) Makefile
 	   $(call git-tar,$(merge-base-id)); \
 	 fi
 
-$(ports-tar-name).tar.bz2: Makefile
+$(ports-tar-name).tar.xz: Makefile
 	@if $(ports-pristine); then \
 	   echo 'Fetching from $(releases-url)...'; \
 	   curl -C - -O $(releases-url)/$@; \
@@ -161,10 +161,10 @@ $(ports-tar-name).tar.bz2: Makefile
 	   $(call ports-git-tar,$(upstream-branch)); \
 	 fi
 
-archives = $(tar-name).tar.bz2 \
-	   $(tar-name)-$(branch-name).tar.bz2 \
+archives = $(tar-name).tar.xz \
+	   $(tar-name)-$(branch-name).tar.xz \
 	   glibc-$(branch-name).patch \
-	   $(ports-tar-name).tar.bz2
+	   $(ports-tar-name).tar.xz
 
 finish_archive: $(archives)
 
diff --git a/fedora/glibc.spec.in b/fedora/glibc.spec.in
index 447d9caa993..76070142c05 100644
--- a/fedora/glibc.spec.in
+++ b/fedora/glibc.spec.in
@@ -29,9 +29,9 @@ Release: 6
 License: LGPLv2+ and LGPLv2+ with exceptions and GPLv2+
 Group: System Environment/Libraries
 URL: http://www.gnu.org/software/glibc/
-Source0: %{?glibc_release_url}%{glibcsrcdir}.tar.bz2
-Source1: %{?glibc_release_url}%{glibcportsdir}.tar.bz2
-Source2: %{glibcsrcdir}-fedora.tar.bz2
+Source0: %{?glibc_release_url}%{glibcsrcdir}.tar.xz
+Source1: %{?glibc_release_url}%{glibcportsdir}.tar.xz
+Source2: %{glibcsrcdir}-fedora.tar.xz
 Patch0: %{name}-fedora.patch
 Patch1: %{name}-ia64-lib64.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)