From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 3 Oct 2016 11:07:44 +0000 (+0100)
Subject: glibc: Remove -command and -headers package
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9ec021753659babcc03d08084c6652c230afd6c3;p=ipfire-3.x.git

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@ipfire.org>
---

diff --git a/glibc/glibc.nm b/glibc/glibc.nm
index 943bf0ef1..5dd018d9e 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@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