Merge branch 'master' into f19

Conflicts:
	satyr.spec

satyr.spec

@@ -2,7 +2,7 @@
 
 Name: satyr
 Version: 0.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Tools to create anonymous, machine-friendly problem reports
 Group: System Environment/Libraries
 License: GPLv2+
@@ -13,15 +13,6 @@ BuildRequires: python2-devel
 BuildRequires: elfutils-devel, elfutils-libelf-devel, binutils-devel
 BuildRequires: rpm-devel
 
-# We're going to switch to elfutils unwinder once it's available
-%if 0%{?rhel}
-%else
-# libunwind exists only on selected arches
-%ifarch %{arm} hppa ia64 mips ppc ppc64 %{ix86} x86_64
-BuildRequires: libunwind-devel >= 1.1
-%endif
-%endif
-
 %description
 Satyr is a library that can be used to create and process microreports.
 Microreports consist of structured data suitable to be analyzed in a fully
@@ -83,9 +74,15 @@ make check
 %{python_sitearch}/%{name}/*
 
 %changelog
+* Thu Jul 25 2013 Martin Milata <mmilata@redhat.com> 0.5-2
+- Remove libunwind dependency altogether, always use GDB for unwinding.
+
 * Thu Jul 25 2013 Jakub Filak <jfilak@redhat.com> 0.5-1
 - Added function that creates core stacktrace from GDB output. Several bugfixes.
 
+* Tue Jul 09 2013 Martin Milata <mmilata@redhat.com> 0.4-2
+- Fix failing tests (failure manifests only on s390x)
+
 * Mon Jul 08 2013 Martin Milata <mmilata@redhat.com> 0.4-1
 - New upstream version
   - Added features needed by ABRT