[python] cleanup of BuildRequires; add comment headings to specfile sections

[dmalcolm]

commit 4f38fe7b1b9e13bb86c2d30e6581c4ea7f15599a
Author: David Malcolm <dmalcolm at redhat.com>
Date:   Fri Jul 8 12:36:16 2011 -0400

    cleanup of BuildRequires; add comment headings to specfile sections

 python.spec |  124 ++++++++++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 106 insertions(+), 18 deletions(-)
---
diff --git a/python.spec b/python.spec
index e4d3c90..78ec2e8 100644
--- a/python.spec
+++ b/python.spec
@@ -1,3 +1,7 @@
+# ======================================================
+# Conditionals and other variables controlling the build
+# ======================================================
+
 %{!?__python_ver:%global __python_ver EMPTY}
 #global __python_ver 27
 %global unicode ucs4
@@ -90,16 +94,71 @@
 # the rest of the build
 %global regenerate_autotooling_patch 0
 
+
+# ==================
+# Top-level metadata
+# ==================
 Summary: An interpreted, interactive, object-oriented programming language
 Name: %{python}
 # Remember to also rebase python-docs when changing this:
 Version: 2.7.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: Python
 Group: Development/Languages
 Requires: %{python}-libs%{?_isa} = %{version}-%{release}
 Provides: python-abi = %{pybasever}
 Provides: python(abi) = %{pybasever}
+
+
+# =======================
+# Build-time requirements
+# =======================
+
+# (keep this list alphabetized)
+
+BuildRequires: autoconf
+BuildRequires: bzip2
+BuildRequires: bzip2-devel
+BuildRequires: db4-devel >= 4.8
+BuildRequires: expat-devel
+BuildRequires: findutils
+BuildRequires: gcc-c++
+BuildRequires: gdbm-devel
+BuildRequires: glibc-devel
+BuildRequires: gmp-devel
+BuildRequires: libffi-devel
+BuildRequires: libGL-devel
+BuildRequires: libX11-devel
+BuildRequires: ncurses-devel
+BuildRequires: openssl-devel
+BuildRequires: pkgconfig
+BuildRequires: readline-devel
+BuildRequires: sqlite-devel
+
+%if 0%{?with_systemtap}
+BuildRequires: systemtap-sdt-devel
+# (this introduces a circular dependency, in that systemtap-sdt-devel's
+# /usr/bin/dtrace is a python script)
+%global tapsetdir      /usr/share/systemtap/tapset
+%endif # with_systemtap
+
+BuildRequires: tar
+BuildRequires: tcl-devel
+BuildRequires: tix-devel
+BuildRequires: tk-devel
+
+%if 0%{?with_valgrind}
+BuildRequires: valgrind-devel
+%endif
+
+BuildRequires: zlib-devel
+
+
+
+# =======================
+# Source code and patches
+# =======================
+
 Source: http://www.python.org/ftp/python/%{version}/Python-%{version}.tar.bz2
 
 # Work around bug 562906 until it's fixed in rpm-build by providing a fixed
@@ -417,6 +476,10 @@ Patch128: python-2.7.1-fix_test_abc_with_COUNT_ALLOCS.patch
 # above:
 Patch300: python-2.7-autotool-intermediates.patch
 
+# ======================================================
+# Additional metadata, and subpackages
+# ======================================================
+
 %if %{main_python}
 Obsoletes: Distutils
 Provides: Distutils
@@ -439,22 +502,6 @@ Provides:   python-argparse = %{version}-%{release}
 %endif
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: readline-devel, openssl-devel, gmp-devel
-BuildRequires: ncurses-devel, gdbm-devel, zlib-devel, expat-devel
-BuildRequires: libGL-devel tk tix gcc-c++ libX11-devel glibc-devel
-BuildRequires: bzip2 tar findutils pkgconfig tcl-devel tk-devel
-BuildRequires: tix-devel bzip2-devel sqlite-devel
-BuildRequires: autoconf
-BuildRequires: db4-devel >= 4.8
-BuildRequires: libffi-devel
-%if 0%{?with_valgrind}
-BuildRequires: valgrind-devel
-%endif
-
-%if 0%{?with_systemtap}
-BuildRequires: systemtap-sdt-devel
-%global tapsetdir      /usr/share/systemtap/tapset
-%endif
 
 URL: http://www.python.org/
 
@@ -531,7 +578,6 @@ color editor (pynche), and a python gettext program (pygettext.py).
 %package -n %{tkinter}
 Summary: A graphical user interface for the Python scripting language
 Group: Development/Languages
-BuildRequires:  tcl, tk
 Requires: %{name} = %{version}-%{release}
 %if %{main_python}
 Obsoletes: tkinter2
@@ -593,6 +639,11 @@ suffix ("foo_d.so" rather than "foo.so") so that each Python implementation can
 load its own extensions.
 %endif # with_debug_build
 
+
+# ======================================================
+# The prep phase of the build:
+# ======================================================
+
 %prep
 %setup -q -n Python-%{version}
 
@@ -670,6 +721,11 @@ find -name "*~" |xargs rm -f
 %patch300 -p0 -b .autotool-intermediates
 %endif
 
+
+# ======================================================
+# Configuring and building the code:
+# ======================================================
+
 %build
 topdir=$(pwd)
 export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -fPIC -fwrapv"
@@ -789,6 +845,11 @@ BuildPython optimized \
   "" \
   true
 
+
+# ======================================================
+# Installing the built code:
+# ======================================================
+
 %install
 topdir=$(pwd)
 rm -rf %{buildroot}
@@ -1062,6 +1123,11 @@ sed \
 %endif # with_debug_build
 %endif # with_systemtap
 
+
+# ======================================================
+# Running the upstream test suite
+# ======================================================
+
 %check
 topdir=$(pwd)
 CheckPython() {
@@ -1339,13 +1405,27 @@ CheckPython \
   optimized \
   python%{pybasever}
 
+# ======================================================
+# Cleaning up
+# ======================================================
+
 %clean
 rm -fr %{buildroot}
 
+
+# ======================================================
+# Scriptlets
+# ======================================================
+
 %post libs -p /sbin/ldconfig
 
 %postun libs -p /sbin/ldconfig
 
+
+# ======================================================
+# Manifests of the various subpackages
+# ======================================================
+
 %files
 %defattr(-, root, root, -)
 %doc LICENSE README
@@ -1679,7 +1759,15 @@ rm -fr %{buildroot}
 # (if it doesn't, then the rpmbuild ought to fail since the debug-gdb.py 
 # payload file would be unpackaged)
 
+
+# ======================================================
+# Finally, the changelog:
+# ======================================================
+
 %changelog
+* Fri Jul  8 2011 David Malcolm <dmalcolm at redhat.com> - 2.7.2-4
+- cleanup of BuildRequires; add comment headings to specfile sections
+
 * Wed Jun 22 2011 David Malcolm <dmalcolm at redhat.com> - 2.7.2-3
 - reorganize test exclusions (test_openpty and test_pty seem to be failing on
 every arch, not just the explicitly-listed ones)