[pyfits/f16: 8/8] New upstream source

[Sergio Pascual]

commit d4f245fb20a5a804fccda6c860b4e24da8b81210
Merge: f202ea0 8b4ae00
Author: Sergio Pascual <sergiopr at fis.ucm.es>
Date:   Tue Jun 26 13:06:57 2012 +0200

    New upstream source
    
    - A better patch to unbundle zlib from Kacper Kowalik (Gentoo)

 .gitignore              |    3 ++
 pyfits-compat-setup.py  |    7 +----
 pyfits-unbundle-z.patch |   48 ++++++++++++++++++++++++++++++++++++++++++
 pyfits.spec             |   53 +++++++++++++++++++++++++++++++++++++++--------
 sources                 |    2 +-
 5 files changed, 98 insertions(+), 15 deletions(-)
---
diff --cc pyfits.spec
index 633d670,fa568fd..72078f0
--- a/pyfits.spec
+++ b/pyfits.spec
@@@ -95,9 -109,34 +109,30 @@@ chmod 755 %{buildroot}%{python_sitearch
  %endif # with_python3
  
  %changelog
- * Fri Jan 20 2012 Sergio Pascual <sergiopr at fedoraproject.org> - 3.0.1-1
+ * Thu Jun 21 2012 Sergio Pascual <sergiopr at fedoraproject.org> - 3.0.8-1
+ - New upstream source
+ - A better patch to unbundle zlib from Kacper Kowalik (Gentoo)
+ 
+ * Wed Apr 25 2012 Sergio Pascual <sergiopr at fedoraproject.org> - 3.0.7-3
+ - Added a filter to provides in python3-pyfits
+ 
+ * Wed Apr 25 2012 Sergio Pascual <sergiopr at fedoraproject.org> - 3.0.7-2
+ - Unbundle zlib
+ 
+ * Tue Apr 24 2012 Sergio Pascual <sergiopr at fedoraproject.org> - 3.0.7-1
+ - New upstream version
+ 
+ * Tue Apr 24 2012 Sergio Pascual <sergiopr at fedoraproject.org> - 3.0.5-2
+ - Fixed bz #815376
+ - Moved python3 requires to package description
+ 
+ * Tue Jan 31 2012 Sergio Pascual <sergiopr at fedoraproject.org> - 3.0.5-1
+ - New upstream version, mainly bugfixes
+ 
+ * Fri Jan 20 2012 Sergio Pascual <sergiopr at fedoraproject.org> - 3.0.1-3
++>>>>>>> master
  - Added compatibility setup.py to avoid using d2to1 package
  - Added a dependency on 2to3
 -
 -* Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0.1-2
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 -
 -* Wed Sep 21 2011 Sergio Pascual <sergiopr at fedoraproject.org> - 3.0.1-1
  - New upstream version (with Python 3 support)
  - Python 3 support enabled