glibc: Drop timezone data and use tzdata package instead.

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

diff --git a/glibc/glibc.nm b/glibc/glibc.nm
index 73372aa50e60dd14194e2d6076f574086d6893e1..26a6d3b164e1e30297b9a69f918966b54f953262 100644 (file)
--- 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    = 1
+release    = 4
 
 maintainer = Michael Tremer <michael.tremer@ipfire.org>
 groups     = System/Base
@@ -29,11 +27,15 @@ source_dl  = http://ftp.gnu.org/gnu/glibc/
 sources    = %{thisapp}.tar.xz
 
 build
+       # Optimize glibc for kernel
+       OPTIMIZED_KERNEL = 2.6.32
+
        requires
                audit-devel
                autoconf
                automake
                gettext
+               kernel-headers>=%{OPTIMIZED_KERNEL}
                libcap-devel
                libselinux-devel
                texinfo
@@ -51,9 +53,6 @@ build
        export CFLAGS   = %{GLIBC_FLAGS}
        export CXXFLAGS = %{GLIBC_FLAGS}
 
-       # Optimize glibc for kernel
-       OPTIMIZED_KERNEL = 2.6.32
-
        export QUALITY_AGENT_RPATH_ALLOW_ORIGIN=yes
 
        prepare_cmds
@@ -192,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
@@ -214,6 +214,11 @@ build
                # Move some libs to correct place
                mv -v %{BUILDROOT}/lib/lib{memusage,pcprofile}.so %{BUILDROOT}/usr/lib/
        end
+
+       keep_libraries
+               /usr/lib/libc_nonshared.a
+               /usr/lib/libpthread_nonshared.a
+       end
 end
 
 packages
@@ -224,6 +229,8 @@ packages
        package glibc-common
                # XXX description and summary are missing
 
+               requires = tzdata
+
                files
                        /usr/bin
                        /usr/sbin