Merge branch 'master' into f20

Conflicts:
	pywbem.spec
This commit is contained in:
Michal Minar 2013-12-17 10:50:00 +01:00
commit 4bf56cebd5

View File

@ -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