[yum-commits] 2 commits - yum.spec

[James Antill]

 yum.spec |   18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

New commits:
commit 4edb352df3af409909049edfdf7d4415f7750c0a
Merge: b5c1792 70d69bc
Author: James Antill <james at and.org>
Date:   Mon Nov 11 01:18:15 2013 -0500

    Merge branch 'master' of ssh://yum.baseurl.org/srv/projects/yum/git/yum
    
    * 'master' of ssh://yum.baseurl.org/srv/projects/yum/git/yum: (3 commits)
      docs: document "yum updateinfo severity <sevs>"
      ...

commit b5c17921cf6b8d4971a86df2c2eb663c942dc7a0
Author: James Antill <james at and.org>
Date:   Mon Nov 11 01:16:42 2013 -0500

    Fixup always turning cron/makecache systemd stuff off.

diff --git a/yum.spec b/yum.spec
index fa8b782..b5f39be 100644
--- a/yum.spec
+++ b/yum.spec
@@ -5,17 +5,25 @@
 %define yum_cron_systemd 1
 %define yum_makecache_systemd 1
 
+%if 0%{?rhel}
+# If we are building for RHEL ...
+
 %if 0%{?rhel} <= 6
 # rhel-6 doesn't have the systemd stuff...
 %define yum_cron_systemd 0
 %define yum_makecache_systemd 0
 %endif
 
-%if ! 0%{?rhel}
-# we don't have this in rhel yet...
-BuildRequires: bash-completion
+# END OF: If we are building for RHEL ...
 %endif
 
+
+%if 0%{?fedora}
+# If we are building for Fedora ...
+
+# we don't have this as of RHEL-7.0.
+BuildRequires: bash-completion
+
 %if 0%{?fedora} <= 18
 # yum in Fedora <= 18 doesn't use systemd unit files...
 %define yum_cron_systemd 0
@@ -26,6 +34,10 @@ BuildRequires: bash-completion
 %define yum_makecache_systemd 0
 %endif
 
+# END OF: If we are building for Fedora ...
+%endif
+
+
 %if %{auto_sitelib}
 
 %{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}