diff -r 51aab9414a86 -r 44acfa481149 binutils/binutils.spec
--- a/binutils/binutils.spec	Sat Mar 26 17:30:52 2011 +0100
+++ b/binutils/binutils.spec	Sat Mar 26 17:31:59 2011 +0100
@@ -1,6 +1,6 @@
 ##
 ##  binutils.spec -- OpenPKG RPM Package Specification
-##  Copyright (c) 2000-2008 OpenPKG Foundation e.V. <http://openpkg.net/>
+##  Copyright (c) 2000-2010 OpenPKG Foundation e.V. <http://openpkg.net/>
 ##
 ##  Permission to use, copy, modify, and distribute this software for
 ##  any purpose with or without fee is hereby granted, provided that
@@ -31,8 +31,8 @@
 Class:        CORE
 Group:        Compiler
 License:      GPL
-Version:      2.18
-Release:      20090106
+Version:      2.21
+Release:      20101212
 
 #   list of sources
 Source0:      ftp://sources.redhat.com/pub/binutils/releases/binutils-%{version}.tar.bz2
@@ -41,8 +41,8 @@
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20060419, make
-PreReq:       OpenPKG, openpkg >= 20060419
+BuildPreReq:  OpenPKG, openpkg >= 20060823, make
+PreReq:       OpenPKG, openpkg >= 20060823
 AutoReq:      no
 AutoReqProv:  no
 
@@ -96,6 +96,8 @@
     CONFIG_SHELL="%{l_bash}" \
     ./configure \
         --prefix=%{l_prefix} \
+        --mandir=%{l_prefix}/man \
+        --infodir=%{l_prefix}/info \
         --includedir=%{l_prefix}/include/binutils \
         --libdir=%{l_prefix}/lib/binutils \
         --disable-werror \
@@ -103,7 +105,7 @@
         $ARGS
 
     #   build package
-    %{l_make} %{l_mflags}
+    %{l_make} %{l_mflags} GREP="grep"
 
 %install
     rm -rf $RPM_BUILD_ROOT
@@ -112,6 +114,8 @@
     %{l_make} %{l_mflags} install \
         prefix=$RPM_BUILD_ROOT%{l_prefix} \
         exec_prefix=$RPM_BUILD_ROOT%{l_prefix} \
+        mandir=$RPM_BUILD_ROOT%{l_prefix}/man \
+        infodir=$RPM_BUILD_ROOT%{l_prefix}/info \
         includedir=$RPM_BUILD_ROOT%{l_prefix}/include/binutils \
         libdir=$RPM_BUILD_ROOT%{l_prefix}/lib/binutils
 
@@ -143,6 +147,7 @@
     rm -f $RPM_BUILD_ROOT%{l_prefix}/man/man1/dlltool.1
     rm -f $RPM_BUILD_ROOT%{l_prefix}/man/man1/nlmconv.1
     rm -f $RPM_BUILD_ROOT%{l_prefix}/man/man1/windres.1
+    rm -f $RPM_BUILD_ROOT%{l_prefix}/man/man1/windmc.1
     rm -rf $RPM_BUILD_ROOT%{l_prefix}/*-*-*
     rm -rf $RPM_BUILD_ROOT%{l_prefix}/bin/c++filt
     strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true