[yum-commits] 3 commits - yum.spec

[James Antill]

 yum.spec |   11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

New commits:
commit 19b9bf82547f4df910bff23165f6511b83902dc1
Merge: c922726 a176dd5
Author: James Antill <james at and.org>
Date:   Fri Nov 15 15:20:46 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: (4 commits)
      installonlypkgs: remove unneeded provides, add "installonlypkg(kernel)"
      ...

commit c922726f8f8455d747ada595c830d7164f3a0818
Author: James Antill <james at and.org>
Date:   Tue Nov 12 11:14:48 2013 -0500

    Use makecache systemd timer on f20, maybe use it on f19 too?

diff --git a/yum.spec b/yum.spec
index 31b51a0..a3e9bcf 100644
--- a/yum.spec
+++ b/yum.spec
@@ -29,8 +29,8 @@ BuildRequires: bash-completion
 %define yum_cron_systemd 0
 %endif
 
-%if 0%{?fedora} <= 20
-# Don't use .timer's before 20
+%if 0%{?fedora} <= 19
+# Don't use .timer's before 20, maybe 19?
 %define yum_makecache_systemd 0
 %endif
 
commit d2e4426c8ca0f1af1a6ce26292a38e281df57688
Author: James Antill <james at and.org>
Date:   Mon Nov 11 09:47:38 2013 -0500

    Fix installing yum systemd makecache.

diff --git a/yum.spec b/yum.spec
index b5f39be..31b51a0 100644
--- a/yum.spec
+++ b/yum.spec
@@ -69,6 +69,9 @@ BuildArchitectures: noarch
 BuildRequires: python
 BuildRequires: gettext
 BuildRequires: intltool
+%if %{yum_makecache_systemd}
+BuildRequires: systemd-units
+%endif
 # This is really CheckRequires ...
 BuildRequires: python-nose
 BuildRequires: python >= 2.4
@@ -248,8 +251,8 @@ rm -f $RPM_BUILD_ROOT/%{_unitdir}/yum-cron.service
 %endif
 
 %if %{yum_makecache_systemd}
-cp -a etc/yum-makecache.service /usr/lib/systemd/system
-cp -a etc/yum-makecache.timer   /usr/lib/systemd/system
+cp -a etc/yum-makecache.service $RPM_BUILD_ROOT/%{_unitdir}
+cp -a etc/yum-makecache.timer   $RPM_BUILD_ROOT/%{_unitdir}
 %endif
 
 %clean