[gyp] Rebase to r2037.

Akira TAGOH tagoh at fedoraproject.org
Mon Mar 2 10:32:55 UTC 2015


commit ae5d74d51ff395588ac4fab52a81158716568d93
Author: Akira TAGOH <tagoh at redhat.com>
Date:   Mon Mar 2 19:26:09 2015 +0900

    Rebase to r2037.

 gyp-python-syntax.patch | 13 +++++++++++++
 gyp.spec                |  2 ++
 2 files changed, 15 insertions(+)
---
diff --git a/gyp-python-syntax.patch b/gyp-python-syntax.patch
new file mode 100644
index 0000000..4cc0d14
--- /dev/null
+++ b/gyp-python-syntax.patch
@@ -0,0 +1,13 @@
+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 02f9f60..dc5a27e 100644
--- a/gyp.spec
+++ b/gyp.spec
@@ -28,6 +28,7 @@ URL:		http://code.google.com/p/gyp/
 # 5. tar -a --exclude-vcs -cf /tmp/gyp-$version-svn$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
@@ -49,6 +50,7 @@ irreconcilable differences.
 %prep
 %setup -q -c -n %{archivename}
 %patch0 -p1 -b .0-rpmoptflags
+%patch1 -p1 -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


More information about the scm-commits mailing list