rpms/glibc-kernheaders/devel glibc-kernheaders.spec, 1.106, 1.107 sources, 1.22, 1.23

Wed Apr 26 23:54:54 UTC 2006

Author: dwmw2

Update of /cvs/dist/rpms/glibc-kernheaders/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5135

Modified Files:
	glibc-kernheaders.spec sources 
Log Message:
Update to new tarball from kernel


Index: glibc-kernheaders.spec
===================================================================
RCS file: /cvs/dist/rpms/glibc-kernheaders/devel/glibc-kernheaders.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107

--- glibc-kernheaders.spec	24 Apr 2006 13:11:41 -0000	1.106
+++ glibc-kernheaders.spec	26 Apr 2006 23:54:51 -0000	1.107
@@ -1,7 +1,7 @@
 Summary: Header files for the Linux kernel for use by glibc
 Name: glibc-kernheaders
 Version: 3.0
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPL
 Group: Development/System
 ExclusiveOS: Linux
@@ -17,33 +17,6 @@
 %endif
 
 Source0: glibc-kernheaders.tar.bz2
-Patch0: glibc-kernheaders-2.4-atmfix.patch
-Patch1: glibc-kernheaders-2.4-mtd.patch
-Patch2: glibc-kernheaders-2.4-audit.patch
-Patch3: glibc-kernheaders-2.4-ppc64-ptrace-1.patch
-Patch4: glibc-kernheaders-2.4-ppc-ptrace-2.patch
-Patch5: glibc-kernheaders-2.4-ia64-ptrace.patch
-Patch6: glibc-kernheaders-2.4-v6only.patch
-#Patch7: glibc-kernheaders-2.4-kversion.patch
-Patch8: glibc-kernheaders-2.4-videodev.patch
-Patch9: glibc-kernheaders-2.4-quota.patch
-Patch10: glibc-kernheaders-2.4-socket.patch
-Patch11: glibc-kernheaders-2.4-x86_64-mce.patch
-Patch12: glibc-kernheaders-2.4-futex.patch
-Patch13: glibc-kernheaders-2.4-gplpedantry.patch
-Patch14: glibc-kernheaders-2.4-x86_64-epoll.patch
-Patch15: glibc-kernheaders-2.4-uinput.patch
-Patch16: glibc-kernheaders-2.4-ppc64-stat.patch
-Patch17: glibc-kernheaders-2.4-ppc64-statfs.patch
-Patch18: glibc-kernheaders-2.4-infiniband.patch
-Patch19: glibc-kernheaders-2.4-miitypes.patch
-Patch20: glibc-kernheaders-2.4-shmexec.patch
-Patch21: glibc-kernheaders-2.4-dvb.patch
-Patch22: glibc-kernheaders-2.4-keyctl.patch
-Patch23: glibc-kernheaders-2.4-unistd.patch
-Patch24: glibc-kernheaders-2.4-watchdog.patch
-Patch25: glibc-kernheaders-2.4-iphdr.patch
-Patch26: glibc-kernheaders-2.4-errno.patch
 
 %description
 Kernel-headers includes the C header files that specify the interface
@@ -56,96 +29,39 @@
 
 %prep
 %setup -q -c
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-#%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
-%patch15 -p1
-%patch16 -p1
-%patch17 -p1
-%patch18 -p1
-%patch19 -p1
-%patch20 -p1
-%patch21 -p1
-%patch22 -p1
-%patch23 -p1
-%patch24 -p1
-%patch25 -p1
 
 %build
 
 %install
 mkdir -p $RPM_BUILD_ROOT
 tar -cf -  usr | tar -xf - -C $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/usr/include/asm
 pushd $RPM_BUILD_ROOT/usr/include
-d1=asm-%{_arch}
-d2=asm
 %ifarch x86_64
-p1='defined __x86_64__'
-d2=asm-i386
-p2='defined __i386__'
-%endif
-%ifarch sparc sparc64
-d1=asm-sparc
-p1='defined __sparc__ && !defined __arch64__'
-d2=asm-sparc64
-p2='defined __sparc__ && defined __arch64__'
+%define removedirs asm-{s390,powerpc,ia64}
+%define asmdir asm-bix86
 %endif
 %ifarch ppc ppc64
-d1=asm-ppc
-p1='defined __powerpc__ && !defined __powerpc64__'
-d2=asm-ppc64
-p2='defined __powerpc64__'
+%define removedirs asm-{s390,i386,x86_64,bix86,ia64}
+%define asmdir asm-powerpc
 %endif
 %ifarch s390 s390x
-d1=asm-s390
-p1='defined __s390__ && !defined __s390x__'
-d2=asm-s390x
-p2='defined __s390x__'
+%define removedirs asm-{i386,x86_64,bix86,powerpc,ia64}
+%define asmdir asm-s390
+%endif
+%ifarch i386
+%define removedirs asm-{s390,x86_64,bix86,powerpc,ia64}
+%define asmdir asm-i386
+%endif
+%ifarch ia64
+%define removedirs asm-{s390,i386,x86_64,bix86,powerpc}
+%define asmdir asm-ia64
 %endif
-for i in asm-*; do
-  case $i in $d1|$d2) ;; *) rm -rf $i;; esac
-done
-if [ "$d2" = "asm" ]; then
-  rm -rf asm
-  mv $d1 asm
-else
-  for f in `find $d1 $d2 -name \*.h -exec basename {} \; | sort -u`; do
-    F=`echo $f | tr a-z. A-Z_`
-    ( cat <<EOF
-#ifndef __ASM_STUB_${F}__
-# define __ASM_STUB_${F}__
-EOF
-      echo "# if $p1"
-      if [ -f $d1/$f ]; then
-	echo "#  include <$d1/$f>"
-      else
-	echo "#  error <$d1/$f> does not exist"
-      fi
-      echo "# endif"
-      echo "# if $p2"
-      if [ -f $d2/$f ]; then
-	echo "#  include <$d2/$f>"
-      else
-	echo "#  error <$d2/$f> does not exist"
-      fi
-      echo "# endif"
-      echo "#endif"
-    ) > asm/$f
-  done
-fi
+
+rm -rf %{removedirs}
+mv %{asmdir} asm
+
+# glibc-headers provides /usr/include/scsi, although it's kernel headers
+rm -rf scsi
 popd
 
 %clean
@@ -170,12 +86,16 @@
 
 %files
 %defattr(-,root,root)
-/usr/include/mtd
-/usr/include/linux
-/usr/include/asm*
+/usr/include/*
 
 
 %changelog
+* Wed Apr 26 2006 David Woodhouse <dwmw2 at redhat.com> 3.0-8
+- Updated tarball from 'make headers_install' from 2.6.16-1.2166_FC6
+  This should match the contents of the 'kernel-headers' subpackage
+  of the kernel, if I was brave enough to actually switch over to that
+  for real. Let's just test it this way for now though...
+
 * Mon Apr 24 2006 Jakub Jelinek <jakub at redhat.com> - 3.0-7
 - fix typo in the i386 fstatat64 change
 - Add new syscalls up to 2006-04-24
@@ -189,6 +109,7 @@
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.0-5.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 
+>>>>>>> 1.106
 * Mon Feb 6 2006 David Woodhouse <dwmw2 at redhat.com> 3.0-5
 - Add EOWNERDEAD and ENOTRECOVERABLE error codes
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/glibc-kernheaders/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	20 Jan 2005 11:22:49 -0000	1.22
+++ sources	26 Apr 2006 23:54:51 -0000	1.23
@@ -1 +1 @@
-e41009e5e188a243a47949695ff3cb0d  glibc-kernheaders.tar.bz2
+116e65e8cdebc8984909ecddeb1add2c  glibc-kernheaders.tar.bz2


