[libtevent/f16: 9/9] Merge branch 'f17' into f16

[Stephen Gallagher]

commit 83c046580354cf87682a65a5e0a0905b28ee6e25
Merge: 7426c88 c5792b2
Author: Stephen Gallagher <sgallagh at redhat.com>
Date:   Fri Feb 17 10:22:52 2012 -0500

    Merge branch 'f17' into f16
    
    Conflicts:
    	.gitignore
    	libtevent.spec
    	sources

 .gitignore                   |    2 +
 libtevent.spec               |   64 ++++++++++++++++++++++++++++++++++++++++--
 sources                      |    2 +-
 tevent_signal_segfault.patch |   23 ---------------
 4 files changed, 64 insertions(+), 27 deletions(-)
---
diff --cc libtevent.spec
index 60bc1b4,95c4972..2c22955
--- a/libtevent.spec
+++ b/libtevent.spec
@@@ -14,9 -14,14 +14,14 @@@ URL: http://tevent.samba.org
  Source: http://samba.org/ftp/tevent/tevent-%{version}.tar.gz
  BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
  
 -BuildRequires: libtalloc-devel >= 2.0.7
 +BuildRequires: libtalloc-devel >= 2.0.5
  BuildRequires: python-devel
 -BuildRequires: pytalloc-devel >= 2.0.7
 +BuildRequires: pytalloc-devel >= 2.0.5
+ BuildRequires: doxygen
+ 
+ Provides: bundled(libreplace)
+ 
+ # Patches
  
  %description
  Tevent is an event system based on the talloc memory management library.
@@@ -84,9 -115,35 +115,36 @@@ rm -rf $RPM_BUILD_ROO
  %postun -p /sbin/ldconfig
  
  %changelog
+ * Fri Feb 10 2012 Stephen Gallagher <sgallagh at redhat.com> - 0.9.15-1
+ - New upstream release 0.9.15
+ - Properly re-sets the nested.level flag in the ev.ctx when reinitializing
+   after a fork()
+ - Allow tevent_signal events to be freed during their handler
+ 
+ * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.14-6
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+ 
+ * Tue Dec 06 2011 Stephen Gallagher <sgallagh at redhat.com> - 0.9.14-4
+ - Include missing patch file
+ 
+ * Tue Dec 06 2011 Stephen Gallagher <sgallagh at redhat.com> - 0.9.14-4
+ - Build pytevent properly
+ 
+ * Thu Dec 01 2011 Stephen Gallagher <sgallagh at redhat.com> - 0.9.14-3
+ - Add patch to ignore --disable-silent-rules
+ - Include API documentation
+ 
+ * Wed Nov 23 2011 Stephen Gallagher <sgallagh at redhat.com> - 0.9.14-2
+ - Add explicit mention of the bundled libreplace
+ - https://fedorahosted.org/fpc/ticket/120
+ 
+ * Wed Nov 09 2011 Stephen Gallagher <sgallagh at redhat.com> - 0.9.14-1
+ - New upstream release
+ - Required for building more recent versions of samba4
+ 
  * Tue Aug  2 2011 Simo Sorce <ssorce at redhat.com> - 0.9.13-1
  - New upstream release
 +  (Needed to build samba4 alpha 16 packages)
  
  * Tue Mar 15 2011 Simo Sorce <ssorce at redhat.com> - 0.9.11-1
  - New upstream release