[python-fedora/epel7: 33/33] Merge remote-tracking branch 'origin/el6' into epel7

[Ricky Elrod]

commit 15b9aa1ca106359edbc40c25111ea6a5848446a1
Merge: 26537e9 648730a
Author: Ricky Elrod <ricky at elrod.me>
Date:   Mon Jan 20 14:04:11 2014 -0500

    Merge remote-tracking branch 'origin/el6' into epel7
    
    Conflicts:
    	python-fedora.spec

 .gitignore          |    1 +
 flask_fas_openid.py |  211 ---------------------------------------------------
 python-fedora.spec  |   62 ++++++++-------
 sources             |    2 +-
 4 files changed, 35 insertions(+), 241 deletions(-)
---
diff --cc python-fedora.spec
index 9a61403,3fe8acf..68ccbb5
--- a/python-fedora.spec
+++ b/python-fedora.spec
@@@ -152,32 -153,32 +153,35 @@@ rm -rf %{buildroot
  %files -f %{name}.lang
  %defattr(-,root,root,-)
  %doc NEWS README COPYING AUTHORS doc
- %{python_sitelib}/*
- %exclude %{python_sitelib}/fedora/tg/
- %exclude %{python_sitelib}/fedora/tg2/
- %exclude %{python_sitelib}/fedora/wsgi/
- %exclude %{python_sitelib}/fedora/django/
- %exclude %{python_sitelib}/flask_fas.py*
- %exclude %{python_sitelib}/flask_fas_openid.py*
+ %{python2_sitelib}/*
+ %exclude %{python2_sitelib}/fedora/tg/
+ %exclude %{python2_sitelib}/fedora/tg2/
+ %exclude %{python2_sitelib}/fedora/wsgi/
+ %exclude %{python2_sitelib}/fedora/django/
+ %exclude %{python2_sitelib}/flask_fas.py*
+ %exclude %{python2_sitelib}/flask_fas_openid.py*
  
  %files turbogears
- %{python_sitelib}/fedora/tg/
+ %{python2_sitelib}/fedora/tg/
  
  %files turbogears2
- %{python_sitelib}/fedora/wsgi/
- %{python_sitelib}/fedora/tg2/
+ %{python2_sitelib}/fedora/wsgi/
+ %{python2_sitelib}/fedora/tg2/
  
  %files django
- %{python_sitelib}/fedora/django/
+ %{python2_sitelib}/fedora/django/
  
  %files flask
- %{python_sitelib}/flask_fas.py*
- %{python_sitelib}/flask_fas_openid.py*
+ %{python2_sitelib}/flask_fas.py*
+ %{python2_sitelib}/flask_fas_openid.py*
  
  %changelog
 +* Fri Jan 10 2014 Dennis Gilmore <dennis at ausil.us> - 0.3.32.3-4
 +- clean up some rhel logic in the spec
 +
+ * Thu Dec 19 2013 Toshio Kuratomi <toshio at fedoraproject.org> - 0.3.33-1
+ - Update for final release with numerous flask_fas_openid fixes
+ 
  * Mon Jul 29 2013 Toshio Kuratomi <toshio at fedoraproject.org> - 0.3.32.3-3
  - Update flask_fas_openid to fix imports