Fix Conflicts

This commit is contained in:
Stephen Gallagher 2014-09-16 11:50:20 -04:00
parent 1c54f5a15e
commit 18cf3ef0f0

View File

@ -2,7 +2,7 @@
Name: python-%{pkgname} Name: python-%{pkgname}
Version: 5.0.1 Version: 5.0.1
Release: 1%{?dist} Release: 2%{?dist}
Summary: Python QR Code image generator Summary: Python QR Code image generator
License: BSD License: BSD
@ -24,6 +24,7 @@ generation of QR Codes.
%package core %package core
Requires: python-six Requires: python-six
Conflicts: python-qrcode < 5.0
Summary: Python QR Code image generator (core library) Summary: Python QR Code image generator (core library)
%description core %description core
@ -83,6 +84,9 @@ done
%changelog %changelog
* Tue Sep 16 2014 Nathaniel McCallum <npmccallum@redhat.com> - 5.0.1-2
- Make python-qrcode-core conflicts with python-qrcode < 5.0
* Wed Sep 10 2014 Nathaniel McCallum <npmccallum@redhat.com> - 5.0.1-1 * Wed Sep 10 2014 Nathaniel McCallum <npmccallum@redhat.com> - 5.0.1-1
- Update to 5.0.1 - Update to 5.0.1