diff --git a/.gitignore b/.gitignore
index 5d246ba..4c34e41 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/gyp-0.1-svn1617.tar.bz2
+SOURCES/gyp-0.1-git0bb6747.tar.bz2
diff --git a/.v8314-gyp.metadata b/.v8314-gyp.metadata
index 43780ec..9048073 100644
--- a/.v8314-gyp.metadata
+++ b/.v8314-gyp.metadata
@@ -1 +1 @@
-cf2e06083bdd1881ad5e0a25e2e843253712189e SOURCES/gyp-0.1-svn1617.tar.bz2
+dc2741b3781c7479945113916b153a1f6413d7fd SOURCES/gyp-0.1-git0bb6747.tar.bz2
diff --git a/SPECS/gyp.spec b/SPECS/gyp.spec
index 9554baf..fd80c13 100644
--- a/SPECS/gyp.spec
+++ b/SPECS/gyp.spec
@@ -1,15 +1,20 @@
 %{?scl:%scl_package gyp}
 %{!?scl:%global pkg_name %{name}}
-
-%global		revision	1617
-%{expand:	%%global	archivename	gyp-%{version}%{?revision:-svn%{revision}}}
-%if !(0%{?fedora} > 12 || 0%{?rhel} > 5)
-%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
+%global		revision	0bb6747
+%{expand:	%%global	archivename	gyp-%{version}%{?revision:-git%{revision}}}
+%if 0%{?rhel} && 0%{?rhel} <= 6
+%{!?__python2: %global __python2 /usr/bin/python2}
+%if 0%{?rhel} == 5
+%global __python2 /usr/bin/python26
+%global __os_install_post %__multiple_python_os_install_post
+%endif
+%{!?python2_sitelib: %global python2_sitelib %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
+%{!?python2_sitearch: %global python2_sitearch %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %endif
 
 Name:		%{?scl_prefix}gyp
 Version:	0.1
-Release:	0.12%{?revision:.%{revision}svn}%{?dist}
+Release:	0.20%{?revision:.%{revision}git}%{?dist}
 Summary:	Generate Your Projects
 
 Group:		Development/Tools
@@ -21,11 +26,19 @@ URL:		http://code.google.com/p/gyp/
 # 1. svn co http://gyp.googlecode.com/svn/trunk gyp
 # 2. cd gyp
 # 3. version=$(grep version= setup.py|cut -d\' -f2)
-# 4. revision=$(svn info|grep -E "^Revision:"|cut -d' ' -f2)
-# 5. tar -a --exclude-vcs -cf /tmp/gyp-$version-svn$revision.tar.bz2 *
+# 4. revision=$(git log --oneline|head -1|cut -d' ' -f1)
+# 5. tar -a --exclude-vcs -cf /tmp/gyp-$version-git$revision.tar.bz2 *
 Source0:	%{archivename}.tar.bz2
 Patch0:		gyp-rpmoptflags.patch
 
+%if 0%{?rhel} && 0%{?rhel} == 5
+BuildRequires:	python26-devel
+%else
+BuildRequires:	python2-devel
+%endif
+BuildRequires:	python-setuptools
+Requires:	python-setuptools
+BuildArch:	noarch
 BuildRequires:	python2-devel
 BuildArch:	noarch
 
@@ -73,6 +86,22 @@ rm -rf $RPM_BUILD_ROOT
 %{?scl:%_scl_root}%{python_sitelib}/*
 
 %changelog
+* Wed Jul 22 2015 Tomas Hrcka <thrcka@redhat.com> - 0.1-0.20.0bb6747git
+- Rebase to latest upstream
+
+* Fri May  1 2015 Akira TAGOH <tagoh@redhat.com> - 0.1-0.17.0bb6747git
+- Rebase to 0bb6747.
+- Add R: python-setuptools (#1217358)
+
+* Mon Mar  2 2015 Akira TAGOH <tagoh@redhat.com> - 0.1-0.16.2037svn
+- Rebase to r2037.
+
+* Wed Jun 25 2014 Akira TAGOH <tagoh@redhat.com> - 0.1-0.15.1617svn
+- Update rpm macros to the latest guidelines.
+- Build against python26 for EPEL5.
+
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
 * Thu Mar 20 2014 Tomas Hrcka <thrcka@redhat.com> - 0.1-0.12.1617svn
 - Obsolete nodejs010-gyp
 
@@ -118,3 +147,4 @@ rm -rf $RPM_BUILD_ROOT
 
 * Wed Aug  4 2010 Akira TAGOH <tagoh@redhat.com> - 0.1-0.1.839svn
 - Initial packaging.
+