[gyp] Rebase to r1010.

[Akira TAGOH]

commit 4eeaed2c6174787c2b08948a041f3b524af75671
Author: Akira TAGOH <tagoh at redhat.com>
Date:   Tue Aug 23 17:32:27 2011 +0900

    Rebase to r1010.

 gyp-rpmoptflags.patch |   58 ++++++++++++++++++++++---------------------------
 gyp.spec              |    9 +++++--
 2 files changed, 32 insertions(+), 35 deletions(-)
---
diff --git a/gyp-rpmoptflags.patch b/gyp-rpmoptflags.patch
index 8f30635..b2246e8 100644
--- a/gyp-rpmoptflags.patch
+++ b/gyp-rpmoptflags.patch
@@ -1,38 +1,32 @@
-Index: pylib/gyp/generator/make.py
-===================================================================
---- pylib/gyp/generator/make.py	(revision 840)
-+++ pylib/gyp/generator/make.py	(working copy)
-@@ -857,14 +857,30 @@
+diff -pruN gyp.orig/pylib/gyp/generator/make.py gyp/pylib/gyp/generator/make.py
+--- gyp.orig/pylib/gyp/generator/make.py	2011-08-23 16:47:59.000000000 +0900
++++ gyp/pylib/gyp/generator/make.py	2011-08-23 17:31:13.000000000 +0900
+@@ -1554,6 +1554,7 @@ $(obj).$(TOOLSET)/$(TARGET)/%%.o: $(obj)
      # Write configuration-specific variables for CFLAGS, etc.
      for configname in sorted(configs.keys()):
        config = configs[configname]
 +      rpmoptflags = ['$(RPM_OPT_FLAGS)']
        self.WriteList(config.get('defines'), 'DEFS_%s' % configname, prefix='-D',
            quoter=EscapeCppDefine)
-       self.WriteLn("# Flags passed to both C and C++ files.");
--      self.WriteList(config.get('cflags'), 'CFLAGS_%s' % configname)
-+      cflags = config.get('cflags')
-+      if cflags:
-+        cflags += rpmoptflags
-+      else:
-+        cflags = rpmoptflags
-+      self.WriteList(cflags, 'CFLAGS_%s' % configname)
-       self.WriteLn("# Flags passed to only C (and not C++) files.");
--      self.WriteList(config.get('cflags_c'), 'CFLAGS_C_%s' % configname)
-+      ccflags = config.get('cflags_c')
-+      if ccflags:
-+        ccflags += rpmoptflags
-+      else:
-+        ccflags = rpmoptflags
-+      self.WriteList(ccflags, 'CFLAGS_C_%s' % configname)
-       self.WriteLn("# Flags passed to only C++ (and not C) files.");
--      self.WriteList(config.get('cflags_cc'), 'CFLAGS_CC_%s' % configname)
-+      cxxflags = config.get('cflags_cc')
-+      if cxxflags:
-+        cxxflags += rpmoptflags
-+      else:
-+        cxxflags = rpmoptflags
-+      self.WriteList(cxxflags, 'CFLAGS_CC_%s' % configname)
-       includes = config.get('include_dirs')
-       if includes:
-         includes = map(Sourceify, map(self.Absolutify, includes))
+ 
+@@ -1565,8 +1566,20 @@ $(obj).$(TOOLSET)/$(TARGET)/%%.o: $(obj)
+         cflags_objcc = self.xcode_settings.GetCflagsObjCC(configname)
+       else:
+         cflags = config.get('cflags')
++        if cflags:
++          cflags += rpmoptflags
++        else:
++          cflags = rpmoptflags
+         cflags_c = config.get('cflags_c')
++        if cflags_c:
++          cflags_c += rpmoptflags
++        else:
++          cflags_c = rpmoptflags
+         cflags_cc = config.get('cflags_cc')
++        if cflags_cc:
++          cflags_cc += rpmoptflags
++        else:
++          cflags_cc = rpmoptflags
+ 
+       self.WriteLn("# Flags passed to all source files.");
+       self.WriteList(cflags, 'CFLAGS_%s' % configname)
diff --git a/gyp.spec b/gyp.spec
index 3b70c8a..850a3a7 100644
--- a/gyp.spec
+++ b/gyp.spec
@@ -1,4 +1,4 @@
-%global		revision	840
+%global		revision	1010
 %{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())")}
@@ -6,7 +6,7 @@
 
 Name:		gyp
 Version:	0.1
-Release:	0.5%{?revision:.%{revision}svn}%{?dist}
+Release:	0.6%{?revision:.%{revision}svn}%{?dist}
 Summary:	Generate Your Projects
 
 Group:		Development/Tools
@@ -37,7 +37,7 @@ irreconcilable differences.
 
 %prep
 %setup -q -c -n %{archivename}
-%patch0 -p0 -b .0-rpmoptflags
+%patch0 -p1 -b .0-rpmoptflags
 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
@@ -64,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Aug 23 2011 Akira TAGOH <tagoh at redhat.com> - 0.1-0.6.1010svn
+- Rebase to r1010.
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1-0.5.840svn
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild