From 78db20dc553f0f8969459ec05d6f00fc2c952a3b Mon Sep 17 00:00:00 2001
From: John Eckersberg <jeckersb@fedoraproject.org>
Date: Jul 22 2009 18:49:39 +0000
Subject: - Minor tweaks to spec file aligning with latest Fedora packaging

    guidelines
- Enforce inclusion of libyaml in build with --with-libyaml option to
    setup.py
- Deliver to %%{python_sitearch} instead of %%{python_sitelib} due to
    _yaml.so
- Thanks to Gareth Armstrong <gareth.armstrong@hp.com>

---

diff --git a/PyYAML.spec b/PyYAML.spec
index f93697b..9572405 100644
--- a/PyYAML.spec
+++ b/PyYAML.spec
@@ -1,15 +1,17 @@
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+
+#====================================================================#
 
 Name:           PyYAML
 Version:        3.08
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        YAML parser and emitter for Python
 
 Group:          Development/Libraries
 License:        MIT
 URL:            http://pyyaml.org/
 Source0:        http://pyyaml.org/download/pyyaml/%{name}-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires:  python-devel, python-setuptools, libyaml-devel
 
@@ -20,38 +22,43 @@ emitter for Python.
 
 PyYAML features a complete YAML 1.1 parser, Unicode support, pickle
 support, capable extension API, and sensible error messages.  PyYAML
-supports standard YAML tags and provides Python-specific tags that allow
-to represent an arbitrary Python object.
+supports standard YAML tags and provides Python-specific tags that
+allow to represent an arbitrary Python object.
 
 PyYAML is applicable for a broad range of tasks from complex
 configuration files to object serialization and persistance.
 
 %prep
 %setup -q -n %{name}-%{version}
+chmod a-x examples/yaml-highlight/yaml_hl.py
 
 
 %build
-%{__python} setup.py build
-chmod a-x examples/yaml-highlight/yaml_hl.py
+CFLAGS="${RPM_OPT_FLAGS}" %{__python} setup.py --with-libyaml build
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/%{_bindir}
-%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
+rm -rf %{buildroot}
+%{__python} setup.py install -O1 --skip-build --root %{buildroot}
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %files
 %defattr(-,root,root,-)
-%doc PKG-INFO README LICENSE examples
-%{python_sitelib}/*
+%doc CHANGES LICENSE PKG-INFO README examples
+%{python_sitearch}/*
 
 
 %changelog
+* Wed Jul 22 2009 - John Eckersberg <jeckersb@redhat.com> - 3.08-5
+- Minor tweaks to spec file aligning with latest Fedora packaging guidelines
+- Enforce inclusion of libyaml in build with --with-libyaml option to setup.py
+- Deliver to %%{python_sitearch} instead of %%{python_sitelib} due to _yaml.so
+- Thanks to Gareth Armstrong <gareth.armstrong@hp.com>
+
 * Tue Mar 3 2009 John Eckersberg <jeckersb@redhat.com> - 3.08-4
 - Correction, change libyaml to libyaml-devel in BuildRequires