[yum-commits] Branch 'yum-3_2_X' - 2 commits - yum.spec

[skvidal at osuosl.org]

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

New commits:
commit f6d294823b861caff6a7e2561d33db87084967d7
Merge: 29856e8... 698d175...
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Thu Jan 13 12:43:44 2011 -0500

    Merge branch 'yum-3_2_X' of ssh://yum.baseurl.org/srv/projects/yum/git/yum into yum-3_2_X
    
    * 'yum-3_2_X' of ssh://yum.baseurl.org/srv/projects/yum/git/yum:
      Add SKIPBROKEN prefix to problem depsolve debug output show we can grep "SKIPBROKEN" to filter the yum debug output to see what problems skip-broken tries to resolve. I removed the _(), translation of debug messages is not needed (my mistake :) )

commit 29856e820c1115c6bd63742823eceba250b0729d
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Thu Jan 13 12:35:28 2011 -0500

    config(noreplace) on the .yum files so you can modify them at your leisure

diff --git a/yum.spec b/yum.spec
index a1fbc72..65a2397 100644
--- a/yum.spec
+++ b/yum.spec
@@ -194,8 +194,8 @@ exit 0
 %defattr(-,root,root)
 %doc COPYING
 %{_sysconfdir}/cron.daily/0yum.cron
-%{_sysconfdir}/yum/yum-daily.yum
-%{_sysconfdir}/yum/yum-weekly.yum
+%config(noreplace) %{_sysconfdir}/yum/yum-daily.yum
+%config(noreplace) %{_sysconfdir}/yum/yum-weekly.yum
 %{_sysconfdir}/rc.d/init.d/yum-cron
 %config(noreplace) %{_sysconfdir}/sysconfig/yum-cron