Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x into arm-port

[people/ms/ipfire-3.x.git] / glibc / glibc.nm

diff --git a/glibc/glibc.nm b/glibc/glibc.nm
index 6d5d5bcca497bcb19438ad24d3a5340a041322b4..efd031cd80deb3dce2cbfbc3a61c153226fee8d7 100644 (file)
--- a/glibc/glibc.nm
+++ b/glibc/glibc.nm
@@ -3,8 +3,6 @@
 # Copyright (C) - IPFire Development Team <info@ipfire.org>                   #
 ###############################################################################
 
-# TODO tzdata
-
 name       = glibc
 version    = 2.14
 release    = 5
@@ -219,6 +217,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
@@ -256,6 +255,8 @@ packages
        package glibc-common
                # XXX description and summary are missing
 
+               requires = tzdata
+
                files
                        /usr/bin
                        /usr/sbin