From 1b84fe311895e8d1323a9f953fd123ab4730ea16 Mon Sep 17 00:00:00 2001
From: dmalcolm <dmalcolm@fedoraproject.org>
Date: May 26 2010 10:28:54 +0000
Subject: - add flags for statvfs.f_flag to the constant list in posixmodule (i.e.

    "os") (patch 114)

---

diff --git a/python-2.6.5-statvfs-f_flag-constants.patch b/python-2.6.5-statvfs-f_flag-constants.patch
new file mode 100644
index 0000000..4b3390d
--- /dev/null
+++ b/python-2.6.5-statvfs-f_flag-constants.patch
@@ -0,0 +1,62 @@
+From 21fda4c78000d78cb1824fdf0373031d07f5325a Mon Sep 17 00:00:00 2001
+From: Peter Jones <pjones@redhat.com>
+Date: Wed, 6 Jan 2010 15:22:38 -0500
+Subject: [PATCH] Add flags for statvfs.f_flag to constant list.
+
+You really need these to figure out what statvfs is trying to say to
+you, so add them here.
+---
+ Modules/posixmodule.c |   37 +++++++++++++++++++++++++++++++++++++
+ 1 files changed, 37 insertions(+), 0 deletions(-)
+
+diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
+index ebdbc8d..d79013b 100644
+--- a/Modules/posixmodule.c
++++ b/Modules/posixmodule.c
+@@ -8990,6 +8990,43 @@ all_ins(PyObject *d)
+ #endif
+ #endif
+ 
++	/* These came from statvfs.h */
++#ifdef ST_RDONLY
++	if (ins(d, "ST_RDONLY", (long)ST_RDONLY)) return -1;
++#endif /* ST_RDONLY */
++#ifdef ST_NOSUID
++	if (ins(d, "ST_NOSUID", (long)ST_NOSUID)) return -1;
++#endif /* ST_NOSUID */
++
++	/* GNU extensions */
++#ifdef ST_NODEV
++	if (ins(d, "ST_NODEV", (long)ST_NODEV)) return -1;
++#endif /* ST_NODEV */
++#ifdef ST_NOEXEC
++	if (ins(d, "ST_NOEXEC", (long)ST_NOEXEC)) return -1;
++#endif /* ST_NOEXEC */
++#ifdef ST_SYNCHRONOUS
++	if (ins(d, "ST_SYNCHRONOUS", (long)ST_SYNCHRONOUS)) return -1;
++#endif /* ST_SYNCHRONOUS */
++#ifdef ST_MANDLOCK
++	if (ins(d, "ST_MANDLOCK", (long)ST_MANDLOCK)) return -1;
++#endif /* ST_MANDLOCK */
++#ifdef ST_WRITE
++	if (ins(d, "ST_WRITE", (long)ST_WRITE)) return -1;
++#endif /* ST_WRITE */
++#ifdef ST_APPEND
++	if (ins(d, "ST_APPEND", (long)ST_APPEND)) return -1;
++#endif /* ST_APPEND */
++#ifdef ST_NOATIME
++	if (ins(d, "ST_NOATIME", (long)ST_NOATIME)) return -1;
++#endif /* ST_NOATIME */
++#ifdef ST_NODIRATIME
++	if (ins(d, "ST_NODIRATIME", (long)ST_NODIRATIME)) return -1;
++#endif /* ST_NODIRATIME */
++#ifdef ST_RELATIME
++	if (ins(d, "ST_RELATIME", (long)ST_RELATIME)) return -1;
++#endif /* ST_RELATIME */
++
+ #if defined(PYOS_OS2)
+         if (insertvalues(d)) return -1;
+ #endif
+-- 
+1.6.6
+
diff --git a/python.spec b/python.spec
index b13e9a6..f0baffe 100644
--- a/python.spec
+++ b/python.spec
@@ -61,7 +61,7 @@ Summary: An interpreted, interactive, object-oriented programming language
 Name: %{python}
 # Remember to also rebase python-docs when changing this:
 Version: 2.6.5
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: Python
 Group: Development/Languages
 Provides: python-abi = %{pybasever}
@@ -373,6 +373,10 @@ Patch112: python-2.6.5-debug-build.patch
 # extension modules will reliably use them
 Patch113: python-2.6.5-more-configuration-flags.patch
 
+# Add flags for statvfs.f_flag to the constant list in posixmodule (i.e. "os")
+# (rhbz:553020); partially upstream as http://bugs.python.org/issue7647
+Patch114: python-2.6.5-statvfs-f_flag-constants.patch
+
 %if %{main_python}
 Obsoletes: Distutils
 Provides: Distutils
@@ -602,6 +606,8 @@ rm -r Modules/zlib || exit 1
 
 %patch113 -p1 -b .more-configuration-flags
 
+%patch114 -p1 -b .statvfs-f-flag-constants
+
 # This shouldn't be necesarry, but is right now (2.2a3)
 find -name "*~" |xargs rm -f
 
@@ -1300,6 +1306,10 @@ rm -fr %{buildroot}
 # payload file would be unpackaged)
 
 %changelog
+* Wed May 26 2010 David Malcolm <dmalcolm@redhat.com> - 2.6.5-11
+- add flags for statvfs.f_flag to the constant list in posixmodule (i.e. "os")
+(patch 114)
+
 * Tue May 25 2010 David Malcolm <dmalcolm@redhat.com> - 2.6.5-10
 - add configure-time support for COUNT_ALLOCS and CALL_PROFILE debug options
 (patch 113); enable them and the WITH_TSC option within the debug build