[mingw-headers/f17: 8/8] Merge branch 'master' into f17

[Erik van Pienbroek]

commit 020cb7d04fbc321ae827d63af9988ab4b54a85fe
Merge: 4f08780 b24e0b9
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Wed Oct 24 21:10:58 2012 +0200

    Merge branch 'master' into f17

 .gitignore         |    6 ++++++
 mingw-headers.spec |   32 +++++++++++++-------------------
 sources            |    2 +-
 3 files changed, 20 insertions(+), 20 deletions(-)
---
diff --cc mingw-headers.spec
index c0de0a1,b375e7c..75ec899
--- a/mingw-headers.spec
+++ b/mingw-headers.spec
@@@ -12,7 -13,7 +13,7 @@@
  
  Name:           mingw-headers
  Version:        2.0.999
- Release:        0.7.trunk.%{snapshot_date}%{?dist}
 -Release:        0.13.%{branch}.%{snapshot_date}%{?dist}
++Release:        0.8.%{branch}.%{snapshot_date}%{?dist}
  Summary:        Win32/Win64 header files
  
  License:        Public Domain and LGPLv2+ and ZPLv2.1
@@@ -116,8 -104,30 +104,14 @@@ rm -f $RPM_BUILD_ROOT%{mingw64_included
  
  
  %changelog
 -* Tue Oct 16 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.0.999-0.13.trunk.20121016
 -- Update to 20121016 snapshot
 -- Use a different source tarball which doesn't contain unrelevant code (like libiberty)
 -- Removed Provides: bundled(libiberty)
 -
 -* Mon Oct 15 2012 Jon Ciesla <limburgher at gmail.com> - 2.0.999-0.12.trunk.20121006
 -- Provides: bundled(libiberty)
 -
 -* Sat Oct  6 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.0.999-0.11.trunk.20121006
 -- Update to 20121006 snapshot
 -
 -* Wed Jul 18 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.0.999-0.10.trunk.20120718
 -- Update to 20120718 snapshot
 -
 -* Fri Jul 13 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.0.999-0.9.trunk.20120713
 -- Update to 20120713 snapshot
 -
 -* Mon Jul 09 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.0.999-0.8.trunk.20120709
 -- Update to 20120709 snapshot (contains full Cygwin support)
++* Wed Oct 24 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.0.999-0.8.trunk.20121016
++- Update to 20121016 snapshot (contains full Cygwin support)
+ - Eliminated various manual kludges as upstream now installs their
+   files to the correct folders by default
++- Use a different source tarball which doesn't contain unrelevant code (like libiberty)
+ 
 -* Thu Jul 05 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.0.999-0.7.trunk.20120705
 -- Update to 20120705 snapshot (contains various Cygwin changes)
 +* Sun Jul 22 2012 Kalev Lember <kalevlember at gmail.com> - 2.0.999-0.7.trunk.20120601
 +- Disable conflicting asprintf and vasprintf definitions in stdio.h
  
  * Sat Jun 02 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.0.999-0.6.trunk.20120601
  - Update to 20120601 snapshot