[bzr] Fix conditional include of python-paramiko

Ondrej Oprala ooprala at fedoraproject.org
Mon May 27 11:21:49 UTC 2013


commit a0d8328a6eb7e5e3a147414a1e8e8b215f262c0d
Author: Ondrej Oprala <ooprala at redhat.com>
Date:   Mon May 27 12:54:15 2013 +0200

    Fix conditional include of python-paramiko

 bzr.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/bzr.spec b/bzr.spec
index a80b72a..13dbcb0 100644
--- a/bzr.spec
+++ b/bzr.spec
@@ -13,7 +13,7 @@
 %global bzrmajor 2.5
 %global bzrminor .1
 #global bzrrc b6
-%global release 7
+%global release 8
 
 Name:           bzr
 Version:        %{bzrmajor}%{?bzrminor}
@@ -36,7 +36,7 @@ BuildRequires:  python-sphinx
 # We're using an old version of Pyrex, use the pregenerated C files instead
 # of rebuilding
 #BuildRequires: Pyrex
-%if 0%{?rhel} && 0%{?rhel} <= 6
+%if 0%{?fedora} || (0%{?rhel} && 0%{?rhel} <= 6)
 Requires:   python-paramiko
 %endif
 # Workaround Bug #230223 otherwise this would be a soft dependency
@@ -142,6 +142,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_defaultdocdir}/%{name}-doc-%{version}/*
 
 %changelog
+* Mon May 27 2013 Ondrej Oprala <ooprala at redhat.com> 2.5.1-8
+- Fix conditional include of python-paramiko
+
 * Fri May 24 2013 Ondrej Oprala <ooprala at redhat.com> - 2.5.1-7
 - Turn off strict aliasing in CFLAGS
 


More information about the scm-commits mailing list