#1 Fix condition for python-simplejson
Merged 6 years ago by lcons. Opened 6 years ago by ishcherb.
rpms/ ishcherb/python-messaging master  into  master

file modified
+6 -3
@@ -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
@@ -22,7 +22,7 @@ 

  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

  
@@ -41,7 +41,7 @@ 

  

  %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}
@@ -119,6 +119,9 @@ 

  %endif # with_python3

  

  %changelog

+ * Fri Feb 09 2018 Iryna Shcherbina <ishcherb@redhat.com> - 1.1-9

+ - Fix condition for python-simplejson

+ 

  * Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-8

  - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild

  

In Fedora %if 0%{?rhel} <= 6 evaluates to 0 <= 6 so this condition is always true. This commit fixes this, and removes the condition for Fedora 11 as it is not supported for a while now.

Scratch build for epel 6: https://koji.fedoraproject.org/koji/taskinfo?taskID=24896912
For Fedora see simple-koji-ci

Commit 049a692 fixes this pull-request

Pull-Request has been merged by lcons

6 years ago

Pull-Request has been merged by lcons

6 years ago