tagoh pushed to gyp (f22). "Rebase to 0bb6747. (..more)"

[notifications at fedoraproject.org]

>From da94949b59bb90f9bc04ba0c14b53bebecaf2a74 Mon Sep 17 00:00:00 2001
From: Akira TAGOH <tagoh at redhat.com>
Date: Fri, 1 May 2015 11:47:50 +0900
Subject: Rebase to 0bb6747.

- Add R: python-setuptools (#1217358)

diff --git a/.gitignore b/.gitignore
index 94ae03c..9a4f870 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ gyp-0.1-svn839.tar.bz2
 /gyp-0.1-svn1569.tar.bz2
 /gyp-0.1-svn1617.tar.bz2
 /gyp-0.1-svn2037.tar.bz2
+/gyp-0.1-git0bb6747.tar.bz2
diff --git a/gyp-python-syntax.patch b/gyp-python-syntax.patch
deleted file mode 100644
index 4cc0d14..0000000
--- a/gyp-python-syntax.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: pylib/gyp/xcodeproj_file.py
-===================================================================
---- pylib/gyp/xcodeproj_file.py	(revision 2037)
-+++ pylib/gyp/xcodeproj_file.py	(working copy)
-@@ -2758,7 +2758,7 @@
-       if (s is not None and not self._IsUniqueSymrootForTarget(s) or
-           s is None and not inherit_unique_symroot):
-         return False
--    return True if symroots else return inherit_unique_symroot
-+    return True if symroots else inherit_unique_symroot
- 
-   def _DefinedSymroots(self, target):
-     # Returns all values for the 'SYMROOT' attribute defined in all
diff --git a/gyp.spec b/gyp.spec
index 3e84c38..3e81512 100644
--- a/gyp.spec
+++ b/gyp.spec
@@ -1,5 +1,5 @@
-%global		revision	2037
-%{expand:	%%global	archivename	gyp-%{version}%{?revision:-svn%{revision}}}
+%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
@@ -12,7 +12,7 @@
 
 Name:		gyp
 Version:	0.1
-Release:	0.16%{?revision:.%{revision}svn}%{?dist}
+Release:	0.17%{?revision:.%{revision}git}%{?dist}
 Summary:	Generate Your Projects
 
 Group:		Development/Tools
@@ -24,11 +24,10 @@ 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
-Patch1:		%{name}-python-syntax.patch
 
 %if 0%{?rhel} && 0%{?rhel} == 5
 BuildRequires:	python26-devel
@@ -36,6 +35,7 @@ BuildRequires:	python26-devel
 BuildRequires:	python2-devel
 %endif
 BuildRequires:	python-setuptools
+Requires:	python-setuptools
 BuildArch:	noarch
 
 %description
@@ -50,7 +50,6 @@ irreconcilable differences.
 %prep
 %setup -q -c -n %{archivename}
 %patch0 -p1 -b .0-rpmoptflags
-%patch1 -p0 -b .1-python
 for i in $(find pylib -name '*.py'); do
 	sed -e '\,#![ \t]*/.*python,{d}' $i > $i.new && touch -r $i $i.new && mv $i.new $i
 done
@@ -71,6 +70,10 @@ done
 
 
 %changelog
+* Fri May  1 2015 Akira TAGOH <tagoh at redhat.com> - 0.1-0.17.0bb6747git
+- Rebase to 0bb6747.
+- Add R: python-setuptools (#1217358)
+
 * Mon Mar  2 2015 Akira TAGOH <tagoh at redhat.com> - 0.1-0.16.2037svn
 - Rebase to r2037.
 
diff --git a/sources b/sources
index f1f2e3e..adfd03e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-abd2817b66efa88226564fbcbc3b6c38  gyp-0.1-svn2037.tar.bz2
+9ed33ddcda33235e438228180d6506af  gyp-0.1-git0bb6747.tar.bz2
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/gyp.git/commit/?h=f22&id=da94949b59bb90f9bc04ba0c14b53bebecaf2a74