[yum/f16: 28/29] Merge branch 'f17' into f16

James Antill james at fedoraproject.org
Mon Mar 12 19:41:13 UTC 2012


commit 5fa98362efae59c5c7f26669b4c1c1365ebcfcf0
Merge: 70e9157 388894b
Author: James Antill <james at and.org>
Date:   Mon Mar 12 15:38:36 2012 -0400

    Merge branch 'f17' into f16
    
    * f17: (21 commits)
      update to latest HEAD.
      ...

 installonlyn-enable.patch      |   12 -
 yum-HEAD.patch                 |156141 +++++++++++++++++++++++++++++++++++++++-
 yum-distro-configs.patch       |   19 +
 yum-mirror-priority.patch      |   11 -
 yum-multilib-policy-best.patch |   11 -
 yum-ppc64-preferred.patch      |    2 +-
 yum.spec                       |  206 +-
 7 files changed, 155609 insertions(+), 793 deletions(-)
---
diff --cc yum.spec
index cf6e969,b5d1fa3..02fe805
--- a/yum.spec
+++ b/yum.spec
@@@ -20,13 -29,10 +29,13 @@@ Patch4: no-more-exactarchlist.patc
  Patch5: geode-arch.patch
  Patch6: yum-HEAD.patch
  Patch7: yum-ppc64-preferred.patch
 +Patch8: yum-arm-hfp-support.patch
 +Patch9: yum-silence.patch
  Patch20: yum-manpage-files.patch
 +Patch21: 0001-Set-_depsolving_failed-as-soon-as-buildTransaction-i.patch
  
  URL: http://yum.baseurl.org/
- BuildArch: noarch
+ BuildArchitectures: noarch
  BuildRequires: python
  BuildRequires: gettext
  BuildRequires: intltool
@@@ -128,10 -136,8 +139,10 @@@ Install this package if you want auto y
  %patch5 -p1
  %patch6 -p1
  %patch7 -p1
 +%patch8 -p1
 +%patch9 -p1
  %patch20 -p1
- %patch21 -p1
+ %patch1 -p1
  
  %build
  make


More information about the scm-commits mailing list