[gyp/el5: 10/10] Merge remote-tracking branch 'origin/el6' into el5

[Akira TAGOH]

commit cdaac97536910b7ef2674161292f3ec132d71139
Merge: 8564e40 2805227
Author: Akira TAGOH <tagoh at redhat.com>
Date:   Wed Jun 25 21:12:56 2014 +0900

    Merge remote-tracking branch 'origin/el6' into el5

 .gitignore |    2 ++
 gyp.spec   |   52 +++++++++++++++++++++++++++++++++++++++-------------
 sources    |    2 +-
 3 files changed, 42 insertions(+), 14 deletions(-)
---
diff --cc gyp.spec
index 8f37ac8,9bc1504..f2ef7ad
--- a/gyp.spec
+++ b/gyp.spec
@@@ -23,9 -29,12 +29,13 @@@ URL:		http://code.google.com/p/gyp
  Source0:	%{archivename}.tar.bz2
  Patch0:		gyp-rpmoptflags.patch
  
+ %if 0%{?rhel} && 0%{?rhel} == 5
+ BuildRequires:	python26-devel
+ %else
  BuildRequires:	python2-devel
+ %endif
  BuildArch:	noarch
 +BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
  
  %description
  GYP is a tool to generates native Visual Studio, Xcode and SCons