From 4bf56cebd5deae22ee2cf3bcb1c3bf43e204f2c2 Mon Sep 17 00:00:00 2001
From: Michal Minar <miminar@redhat.com>
Date: Dec 17 2013 09:50:00 +0000
Subject: Merge branch 'master' into f20


Conflicts:
	pywbem.spec

---

diff --git a/pywbem.spec b/pywbem.spec
index 83bffb1..b7982be 100644
--- a/pywbem.spec
+++ b/pywbem.spec
@@ -4,7 +4,7 @@
 
 Name:           pywbem 
 Version:        0.7.0
-Release:        19.%{revdate}svn%{svnrev}%{?dist}
+Release:        20.%{revdate}svn%{svnrev}%{?dist}
 Summary:        Python WBEM Client and Provider Interface
 Group:          Development/Libraries
 License:        LGPLv2
@@ -15,6 +15,7 @@ URL:            http://pywbem.sourceforge.net
 #  tar -cJvf pywbem-20130128.tar.xz pywbem-20130128
 Source0:        %{name}-%{revdate}.tar.xz
 BuildRequires:  python-setuptools-devel 
+BuildRequires:  m2crypto
 BuildArch:      noarch
 Requires:       m2crypto
 
@@ -83,7 +84,7 @@ rm -rf %{buildroot}
 %{python_sitelib}/pywbem/twisted_client.py*
 
 %changelog
-* Tue Dec 17 2013 Michal Minar <miminar@redhat.com> 0.7.0-19.20131121svn656
+* Tue Dec 17 2013 Michal Minar <miminar@redhat.com> 0.7.0-20.20131121svn656
 - Tweaked the ssl_verify_host patch.
 
 * Mon Dec 16 2013 Michal Minar <miminar@redhat.com> 0.7.0-18.20131121svn656