From 049a69223dbdada23641d958060698044832348f Mon Sep 17 00:00:00 2001 From: Lionel Cons Date: Feb 21 2018 10:04:30 +0000 Subject: Merge #1 `Fix condition for python-simplejson` --- diff --git a/python-messaging.spec b/python-messaging.spec index 7976b86..19933d7 100644 --- a/python-messaging.spec +++ b/python-messaging.spec @@ -9,7 +9,7 @@ Name: python-messaging Version: 1.1 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Python abstraction of a "message" Group: Development/Libraries License: ASL 2.0 @@ -21,7 +21,7 @@ BuildRequires: python2-devel BuildRequires: python3-devel %endif # if with_python3 # For python < 2.6 python-simplejson is required -%if 0%{?fedora} < 11 || 0%{?rhel} <= 6 +%if 0%{?rhel} && 0%{?rhel} <= 6 BuildRequires: python-simplejson %endif @@ -40,7 +40,7 @@ module Messaging::Message. %package -n python2-messaging Summary: %summary -%if 0%{?fedora} < 11 || 0%{?rhel} <= 6 +%if 0%{?rhel} && 0%{?rhel} <= 6 Requires: python-simplejson %endif %{?python_provide:%python_provide python2-messaging} @@ -115,6 +115,9 @@ popd %endif # with_python3 %changelog +* Fri Feb 09 2018 Iryna Shcherbina - 1.1-9 +- Fix condition for python-simplejson + * Fri Feb 09 2018 Fedora Release Engineering - 1.1-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild