Merge remote-tracking branch 'stevee/openvswitch-systemd'

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

diff --git a/glibc/glibc.nm b/glibc/glibc.nm
index 100fc25af9bc75ac09330a5918aca480db7f85ef..8a12d01f7c1137bc7c9160f4f53e15f19e4ecfa0 100644 (file)
--- a/glibc/glibc.nm
+++ b/glibc/glibc.nm
@@ -5,7 +5,7 @@
 
 name       = glibc
 version    = 2.16.0
-release    = 1
+release    = 3
 
 maintainer = Michael Tremer <michael.tremer@ipfire.org>
 groups     = System/Base
@@ -244,18 +244,22 @@ end
 
 packages
        package glibc
-               requires = glibc-common=%{thisver}
+               requires = glibc-common = %{thisver}
 
                if "%{DISTRO_ARCH}" == "armv7hl"
                        provides += ld-linux.so.3
                        provides += ld-linux.so.3(GLIBC_2.4)
+                       provides += ld-linux.so.3(GLIBC_PRIVATE)
                end
        end
 
        package glibc-common
                # XXX description and summary are missing
 
-               requires = tzdata
+               requires
+                       glibc = %{thisver}
+                       tzdata
+               end
 
                files
                        /usr/bin
@@ -281,7 +285,10 @@ packages
                end
                group = Development/Libraries
 
-               requires = glibc-headers=%{thisver}
+               requires
+                       glibc = %{thisver}
+                       glibc-headers = %{thisver}
+               end
 
                files
                        %{includedir}
@@ -303,7 +310,10 @@ packages
                        use the standard C libraries.
                end
 
-               requires = kernel-headers
+               requires
+                       glibc = %{thisver}
+                       kernel-headers >= %{OPTIMIZED_KERNEL}
+               end
 
                files
                        /usr/include