[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 9ec021753659babcc03d08084c6652c230afd6c3

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 9ec021753659babcc03d08084c6652c230afd6c3

[git]

[-- Attachment #1: Type: text/plain, Size: 4013 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  9ec021753659babcc03d08084c6652c230afd6c3 (commit)
      from  6af225ae05e1f9f12b17e9d299fc0f6f3c0af97a (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 9ec021753659babcc03d08084c6652c230afd6c3
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Mon Oct 3 12:07:44 2016 +0100

    glibc: Remove -command and -headers package
    
    These packages are a bit redundant and got now
    merged into the main package and the -devel package.
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

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

Summary of changes:
 glibc/glibc.nm | 71 ++++++++++++----------------------------------------------
 1 file changed, 14 insertions(+), 57 deletions(-)

Difference in files:
diff --git a/glibc/glibc.nm b/glibc/glibc.nm
index 943bf0e..5dd018d 100644
--- a/glibc/glibc.nm
+++ b/glibc/glibc.nm
@@ -5,7 +5,7 @@
 
 name       = glibc
 version    = 2.24
-release    = 1
+release    = 2
 
 maintainer = Michael Tremer <michael.tremer(a)ipfire.org>
 groups     = System/Base
@@ -179,86 +179,43 @@ end
 
 packages
 	package glibc
-		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
 
-		conflicts
-			kernel < %{OPTIMIZED_KERNEL}
-		end
-	end
-
-	package glibc-common
-		# XXX description and summary are missing
-
 		requires
-			glibc = %{thisver}
 			tzdata
 		end
 
-		files
-			/usr/bin
-			/usr/sbin
-			/usr/share
-			/usr/lib/locale
-			!/usr/share/zoneinfo
+		conflicts
+			kernel < %{OPTIMIZED_KERNEL}
+		end
+
+		obsoletes
+			glibc-common < %{thisver}
 		end
 	end
 
 	package glibc-devel
-		summary = Object files for development using standard C libraries.
-		description
-			The glibc-devel package contains the object files necessary
-			for developing programs which use the standard C libraries (which are
-			used by nearly all programs).  If you are developing programs which
-			will use the standard C libraries, your system needs to have these
-			standard object files available in order to create the
-			executables.
-
-			Install glibc-devel if you are going to develop programs which will
-			use the standard C libraries.
-		end
-		group = Development/Libraries
+		template DEVEL
 
 		requires
 			glibc = %{thisver}
 			glibc-headers = %{thisver}
+			kernel-headers >= %{OPTIMIZED_KERNEL}
 		end
 
-		files
-			%{includedir}
-			%{libdir}/*.a
-			%{libdir}/*.o
-		end
-	end
-
-	package glibc-headers
-		description
-			The glibc-headers package contains the header files necessary
-			for developing programs which use the standard C libraries (which are
-			used by nearly all programs).  If you are developing programs which
-			will use the standard C libraries, your system needs to have these
-			standard header files available in order to create the
-			executables.
-
-			Install glibc-headers if you are going to develop programs which will
-			use the standard C libraries.
+		provides
+			glibc-headers = %{thisver}
 		end
 
-		requires
-			glibc = %{thisver}
-			kernel-headers >= %{OPTIMIZED_KERNEL}
+		obsoletes
+			glibc-headers < %{thisver}
 		end
 
-		files
-			/usr/include
-			!/usr/include/linuxthreads
-			!/usr/include/gnu/stubs-[32164]*.h
-		end
+		files += %{libdir}/*.[ao]
 	end
 
 	package nscd


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