#2 Fix condition for EPEL
Merged 6 years ago by kparal. Opened 6 years ago by ishcherb.
rpms/ ishcherb/python-resultsdb_api master  into  master

file modified
+5 -2
@@ -1,7 +1,7 @@ 

  Name:           python-resultsdb_api

  # NOTE: if you update version, *make sure* to also update `setup.py`

  Version:        2.0.0

- Release:        7%{?dist}

+ Release:        8%{?dist}

  Summary:        Interface api to ResultsDB

  

  License:        GPLv2+
@@ -26,7 +26,7 @@ 

  BuildRequires:  python-virtualenv

  %endif

  

- %if 0%{?fedora} <= 27 || 0%{?epel} <= 7

+ %if (0%{?fedora} && 0%{?fedora} <= 27) || (0%{?epel} && 0%{?epel} <= 7)

  BuildRequires:  python-dingus

  %else

  BuildRequires:  python2-dingus
@@ -68,6 +68,9 @@ 

  %{python2_sitelib}/*.egg-info

  

  %changelog

+ * Mon Feb 05 2018 Iryna Shcherbina <ishcherb@redhat.com> - 2.0.0-8

+ - Fix condition for EPEL

+ 

  * Mon Feb 05 2018 Kamil Páral <kparal@redhat.com> - 2.0.0-7

  - Fix deps for EPEL

  

I believe %if 0%{?epel} <= 7 in Fedora evaluates to %if 0 <= 7, so it is always true. This is why the condition did not work for f28: https://koji.fedoraproject.org/koji/rpminfo?rpmID=12679040

I would suggest to change it to something like this. I have done scratch builds for f28 and epel7
F28: https://koji.fedoraproject.org/koji/taskinfo?taskID=24730621
EPEL7: https://koji.fedoraproject.org/koji/taskinfo?taskID=24730623

Damned rpm macros. Thank you.

Pull-Request has been merged by kparal

6 years ago