[shedskin/el5: 2/2] Merge branch 'el6' into el5

[tomspur]

commit c0ec388ae66fe7d2395c6b2a59ccc7a862ba20cf
Merge: a33c6a9 a5dc0e4
Author: Thomas Spura <thomas.spura at gmail.com>
Date:   Mon Sep 12 17:32:46 2011 +0200

    Merge branch 'el6' into el5

 .gitignore    |    1 +
 shedskin.spec |    7 +++++--
 sources       |    2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --cc shedskin.spec
index a1311b3,673b56f..66c283b
--- a/shedskin.spec
+++ b/shedskin.spec
@@@ -1,13 -1,8 +1,13 @@@
  # add --without testsuite option, i.e. enable testsuite by default
  %bcond_without testsuite
  
 +%if ! (0%{?rhel} > 5)
 +%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
 +%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 +%endif
 +
  Name:           shedskin
- Version:        0.8
+ Version:        0.9
  Release:        1%{?dist}
  Summary:        Python to C++ compiler
  
@@@ -82,14 -74,16 +82,17 @@@ rm -rf %{buildroot
  
  %files
  %defattr(-,root,root,-)
- %doc LICENSE README.html
+ %doc LICENSE README doc/
  %{_bindir}/shedskin
  %{python_sitelib}/shedskin/
 +%if ! (0%{?rhel} > 5)
  %{python_sitelib}/shedskin-*.egg-info
 -
 +%endif
  
  %changelog
+ * Mon Sep 12 2011 Thomas Spura <tomspur at fedoraproject.org> - 0.9-1
+ - update to new version
+ 
  * Wed Jun 15 2011 Thomas Spura <tomspur at fedoraproject.org> - 0.8-1
  - update to new version
  - run tests, when building