[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 1262a2912640dfc79e54f3f90d92006bc12ea270

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 1262a2912640dfc79e54f3f90d92006bc12ea270

[git]

[-- Attachment #1: Type: text/plain, Size: 2329 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 3.x development tree".

The branch, master has been updated
       via  1262a2912640dfc79e54f3f90d92006bc12ea270 (commit)
      from  67b0a3f9255fb428c7b2578abdf0e1fa45d34903 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 1262a2912640dfc79e54f3f90d92006bc12ea270
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Wed Jul 11 09:59:16 2012 +0200

    glibc: Make sure that all subpackages are the same version.
    
    It has been possible to install a newer version of
    glibc-devel and glibc-headers than the actual library.
    This resulted in various linking problems.

-----------------------------------------------------------------------

Summary of changes:
 glibc/glibc.nm |   19 ++++++++++++++-----
 1 files changed, 14 insertions(+), 5 deletions(-)

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


hooks/post-receive
--
IPFire 3.x development tree