From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 4 Dec 2011 00:53:36 +0000 (+0100)
Subject: glibc: Drop timezone data and use tzdata package instead.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b0f38bbb44958bb1581812dc201ed04daf29c101;p=ipfire-3.x.git

glibc: Drop timezone data and use tzdata package instead.
---

diff --git a/glibc/glibc.nm b/glibc/glibc.nm
index 3fdba7b84..26a6d3b16 100644
--- a/glibc/glibc.nm
+++ b/glibc/glibc.nm
@@ -3,11 +3,9 @@
 # Copyright (C) - IPFire Development Team <info@ipfire.org>                   #
 ###############################################################################
 
-# TODO tzdata
-
 name       = glibc
 version    = 2.14
-release    = 3
+release    = 4
 
 maintainer = Michael Tremer <michael.tremer@ipfire.org>
 groups     = System/Base
@@ -193,6 +191,7 @@ build
 		# Timezone
 		cp -v --remove-destination %{BUILDROOT}/usr/share/zoneinfo/GMT \
 			%{BUILDROOT}/etc/localtime
+		rm -rf %{BUILDROOT}/usr/share/zoneinfo
 
 		# Configuration
 		cp -vf %{DIR_SOURCE}/{ld.so.conf,nsswitch.conf} %{BUILDROOT}/etc
@@ -230,6 +229,8 @@ packages
 	package glibc-common
 		# XXX description and summary are missing
 
+		requires = tzdata
+
 		files
 			/usr/bin
 			/usr/sbin