[python-zope-component: 7/8] Merge branch 'el6'

[Ralph Bean ☃]

commit 5884cf4b37290e18daf674dae5d4aa28f92b9309
Merge: 5be4238 bd1375a
Author: Ralph Bean <rbean at redhat.com>
Date:   Mon Feb 25 14:23:38 2013 -0500

    Merge branch 'el6'
    
    Conflicts:
    	python-zope-component.spec

 .gitignore                 |    1 -
 python-zope-component.spec |   10 +++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)
---
diff --cc .gitignore
index 3201288,6b3b7d4..fe95a61
--- a/.gitignore
+++ b/.gitignore
@@@ -1,4 -1,2 +1,3 @@@
- /zope.component-3.9.5.tar.gz
  /zope.component-3.10.0.tar.gz
  /zope.component-4.0.1.tar.gz
 +/zope.component-4.0.2.tar.gz
diff --cc python-zope-component.spec
index 5ed664a,912ec29..f316e06
--- a/python-zope-component.spec
+++ b/python-zope-component.spec
@@@ -119,15 -119,13 +119,19 @@@ pop
  %exclude %{python3_sitelib}/zope/component/*.txt
  %{python3_sitelib}/%{modname}-*.egg-info
  %{python3_sitelib}/%{modname}-*-nspkg.pth
- 
+ %endif
  
  %changelog
 +* Mon Feb 25 2013 Ralph Bean <rbean at redhat.com> - 4.0.2-1
 +- Latest upstream.
 +
- * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.0.1-2
++* Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.0.1-3
 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 +
+ * Mon Dec 03 2012 Tomas Dabasinskas <tomas at redhat.com> - 4.0.1-2
+ - Fixed python3 package files section
+ - Removed exclude *.txt for pyhon2 package as no txt files are generated during install
+ 
  * Thu Nov 29 2012 Ralph Bean <rbean at redhat.com> - 4.0.1-1
  - Updated to latest upstream.
  - Included python3 subpackage.