rpms / dionaea

Clone
Source Code
GIT

#1 Fix condition for python-sphinx on Fedora
Merged 6 years ago by rebus. Opened 6 years ago by ishcherb.
rpms/ ishcherb/dionaea pyambiguous  into  master

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

  # Build source is github release=1 or git commit=0
 

  %global         build_release    0
 

  

- %global         rel              7
 

+ %global         rel              8
 

  

  %if 0%{?build_release}  > 0
 

  Release:        %{rel}%{?dist}
 
@@ -160,7 +160,7 @@ 
 

  

  

  # Documentation generation
 

- %if  0%{?rhel} <= 7
 

+ %if 0%{?rhel} && 0%{?rhel} <= 7
 

  BuildRequires:  python-sphinx
 

  %else
 

  BuildRequires:  python3-sphinx
 
@@ -455,6 +455,9 @@ 
 

  

  

  %changelog
 

+ * Mon Apr 30 2018 Iryna Shcherbina <shcherbina.iryna@gmail.com> - 0.6.0-8.20180326git1748f3b
 

+ - Fix condition for python-sphinx on Fedora
 

+ 

  * Fri Apr 20 2018 Michal Ambroz <rebus at, seznam.cz> 0.6.0-7.20180326git1748f3b
 

  - fix the link creation to python core library

On Fedora 0%{?rhel} evaluates to 0, so 0%{?rhel} <= 7 evaluates to True.
This change makes sure that python3-sphinx is required on Fedora.

bump the global rel above instead?

1 new commit added

  • Bump the global rel variable instead of Release itself
6 years ago

bump the global rel above instead?

Right, fixed in the last commit. I usedrpmdev-bumpspec command for changelog entry, so I did not notice it.

Yes, rpmdev-bumpspec sometimes blows up with complicated stuff.

Pull-Request has been merged by rebus
6 years ago

Thank you. I was up to merge the release manually, but haven't found the time to fix and test the other issues in dionaea during weekend.

thanks for merging @rebus !
Changes Summary 1
+5 -2
file changed
dionaea.spec
Powered by Pagure 5.13.3
Documentation • File an Issue • About this Instance • SSH Hostkey/Fingerprint
© Red Hat, Inc. and others.