bring back uname -p/-i functionality except of the athlon hack(#548834),

comment patches

coreutils-8.2-uname-processortype.patch

@@ -0,0 +1,49 @@
+diff -urNp coreutils-8.2-orig/src/uname.c coreutils-8.2/src/uname.c
+--- coreutils-8.2-orig/src/uname.c	2009-09-23 10:25:44.000000000 +0200
++++ coreutils-8.2/src/uname.c	2009-12-19 09:09:11.663607110 +0100
+@@ -301,7 +301,7 @@ main (int argc, char **argv)
+ 
+   if (toprint & PRINT_PROCESSOR)
+     {
+-      char const *element = unknown;
++      char *element = unknown;
+ #if HAVE_SYSINFO && defined SI_ARCHITECTURE
+       {
+         static char processor[257];
+@@ -308,6 +308,12 @@ main (int argc, char **argv)
+         if (0 <= sysinfo (SI_ARCHITECTURE, processor, sizeof processor))
+           element = processor;
+       }
++#else
++      {
++	struct utsname u;
++	uname(&u);
++	element = u.machine;
++      }
+ #endif
+ #ifdef UNAME_PROCESSOR
+       if (element == unknown)
+@@ -351,7 +357,7 @@ main (int argc, char **argv)
+ 
+   if (toprint & PRINT_HARDWARE_PLATFORM)
+     {
+-      char const *element = unknown;
++      char *element = unknown;
+ #if HAVE_SYSINFO && defined SI_PLATFORM
+       {
+         static char hardware_platform[257];
+@@ -353,6 +359,14 @@ main (int argc, char **argv)
+                           hardware_platform, sizeof hardware_platform))
+           element = hardware_platform;
+       }
++#else
++      {
++	struct utsname u;
++	uname(&u);
++	element = u.machine;
++	if(strlen(element)==4 && element[0]=='i' && element[2]=='8' && element[3]=='6')
++		element[1]='3';
++      }
+ #endif
+ #ifdef UNAME_HARDWARE_PLATFORM
+       if (element == unknown)

coreutils.spec

@@ -1,7 +1,7 @@
 Summary: A set of basic GNU tools commonly used in shell scripts
 Name:    coreutils
 Version: 8.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv3+
 Group:   System Environment/Base
 Url:     http://www.gnu.org/software/coreutils/
@@ -20,12 +20,19 @@ Source203:  coreutils-runuser-l.pamd
 # From upstream
 
 # Our patches
+#general patch to workaround koji build system issues
 Patch100: coreutils-6.10-configuration.patch
+#add note about no difference between binary/text mode on Linux - md5sum manpage
 Patch101: coreutils-6.10-manpages.patch
+#temporarily workaround probable kernel issue with TCSADRAIN(#504798)
 Patch102: coreutils-7.4-sttytcsadrain.patch
+#do display processor type for uname -p/-i based on uname(2) syscall
+Patch103: coreutils-8.2-uname-processortype.patch
 
 # sh-utils
+#add info about TZ envvar to date manpage
 Patch703: sh-utils-2.0.11-dateman.patch
+#set paths for su explicitly, don't get influenced by paths.h
 Patch704: sh-utils-1.16-paths.patch
 # RMS will never accept the PAM patch because it removes his historical
 # rant about Twenex and the wheel group, so we'll continue to maintain
@@ -33,14 +40,21 @@ Patch704: sh-utils-1.16-paths.patch
 Patch706: coreutils-pam.patch
 Patch713: coreutils-4.5.3-langinfo.patch
 
-# (sb) lin18nux/lsb compliance
+# (sb) lin18nux/lsb compliance - multibyte functionality patch
 Patch800: coreutils-i18n.patch
 
+#Call setsid() in su under some circumstances (bug #173008).
 Patch900: coreutils-setsid.patch
+#make runuser binary based on su.c
 Patch907: coreutils-5.2.1-runuser.patch
+#getgrouplist() patch from Ulrich Drepper.
 Patch908: coreutils-getgrouplist.patch
+#Prevent buffer overflow in who(1) (bug #158405).
 Patch912: coreutils-overflow.patch
+#split the PAM scripts for "su -l"/"runuser -l" from that of normal "su" and
+#"runuser" (#198639)
 Patch915: coreutils-split-pam.patch
+#prevent koji build failure with wrong getfacl exit code
 Patch916: coreutils-getfacl-exit-code.patch
 
 #SELINUX Patch - implements Redhat changes
@@ -104,6 +118,7 @@ Libraries for coreutils package.
 %patch100 -p1 -b .configure
 %patch101 -p1 -b .manpages
 %patch102 -p1 -b .tcsadrain
+%patch103 -p1 -b .sysinfo
 
 # sh-utils
 %patch703 -p1 -b .dateman
@@ -316,10 +331,15 @@ fi
 %{_libdir}/coreutils
 
 %changelog
+* Sat Dec 19 2009 Ondrej Vasik <ovasik@redhat.com> - 8.2-4
+- bring back uname -p/-i functionality except of the
+  athlon hack(#548834)
+- comment patches
+
 * Wed Dec 16 2009 Ondrej Vasik <ovasik@redhat.com> - 8.2-3
 - use grep instead of deprecated egrep in colorls.sh script
   (#548174)
-- remove unnecessary versioned requires
+- remove unnecessary versioned requires/conflicts
 - remove non-upstream hack for uname -p
 
 * Wed Dec 16 2009 Ondrej Vasik <ovasik@redhat.com> - 8.2-2