[python-matplotlib] Remove a debugging echo statement from the spec file Fix some line endings and permissions in -doc s

Jonathan G. Underwood jgu at fedoraproject.org
Fri Feb 25 17:07:38 UTC 2011


commit 0e79a43bbfeaad7cd1c5f63a439f0ed89a0c9114
Author: Jonathan G. Underwood <jonathan.underwood at gmail.com>
Date:   Fri Feb 25 17:07:26 2011 +0000

    Remove a debugging echo statement from the spec file
    Fix some line endings and permissions in -doc sub-package

 python-matplotlib.spec |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)
---
diff --git a/python-matplotlib.spec b/python-matplotlib.spec
index bb5be7b..5e3bf62 100644
--- a/python-matplotlib.spec
+++ b/python-matplotlib.spec
@@ -16,7 +16,7 @@
 
 Name:           python-matplotlib
 Version:        1.0.1
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Python plotting library
 
 Group:          Development/Libraries
@@ -93,6 +93,9 @@ chmod -x lib/matplotlib/mpl-data/images/*.svg
 # drag in dependencies
 find examples -name '*.py' -exec chmod a-x '{}' \;
 
+# Fix line ending in this example file
+sed -i 's/\r//' examples/api/font_family_rc.py
+
 %build
 cp %{SOURCE2} ./setup.cfg
 %{__python} setup.py build
@@ -106,9 +109,11 @@ pushd doc
 echo "examples.download : False" >> matplotlibrc
 echo "examples.directory : %{sampledatadir}" >> matplotlibrc
 # This really does need to be ran twice
-echo $PYTHONPATH
 export PYTHONPATH=%{libpath}
 %{__python} make.py --small html && %{__python} make.py --small html
+rm -f html/.buildinfo
+chmod -x html/pyplots/make.py
+sed -i 's/\r//' html/_sources/devel/add_new_projection.txt
 popd
 %endif
 
@@ -158,6 +163,10 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Fri Feb 25 2011 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 1.0.1-7
+- Remove a debugging echo statement from the spec file
+- Fix some line endings and permissions in -doc sub-package
+
 * Fri Feb 25 2011 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 1.0.1-6
 - Spec file cleanups to silence some rpmlint warnings
 


More information about the scm-commits mailing list