[mash] pull in patches from upstream for secondary arch config fixes
Dennis Gilmore
ausil at fedoraproject.org
Tue Apr 3 19:49:22 UTC 2012
commit 8d23380e9e5528616854a61cd9a3ffb08fa0396b
Author: Dennis Gilmore <dennis at ausil.us>
Date: Tue Apr 3 14:49:16 2012 -0500
pull in patches from upstream for secondary arch config fixes
0001-set-prefer_ppc64-to-true-on-ppc-configs.patch | 39 +++++++++++
...set-the-repoviewurl-to-refleect-17-not-15.patch | 67 ++++++++++++++++++++
mash.spec | 9 +++-
3 files changed, 114 insertions(+), 1 deletions(-)
---
diff --git a/0001-set-prefer_ppc64-to-true-on-ppc-configs.patch b/0001-set-prefer_ppc64-to-true-on-ppc-configs.patch
new file mode 100644
index 0000000..5b92772
--- /dev/null
+++ b/0001-set-prefer_ppc64-to-true-on-ppc-configs.patch
@@ -0,0 +1,39 @@
+From 5c5a65ee439456dc744f97222dff528bb887eb6c Mon Sep 17 00:00:00 2001
+From: Dennis Gilmore <dennis at ausil.us>
+Date: Tue, 3 Apr 2012 10:51:42 -0500
+Subject: [PATCH 1/2] set prefer_ppc64 to true on ppc configs
+
+---
+ configs/branched.ppc.mash | 3 ++-
+ configs/mash.ppc.conf | 1 +
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/configs/branched.ppc.mash b/configs/branched.ppc.mash
+index d31d0dc..0d0bd08 100644
+--- a/configs/branched.ppc.mash
++++ b/configs/branched.ppc.mash
+@@ -11,10 +11,11 @@ tag = f17
+ inherit = False
+ strict_keys = True
+ keys = 34E166FA, A82BA4B7, 069C8460, 97A1071F, E8E40FDE, 57BBCCBA, D22E77F2, 4EBFC273, 0B86274E, 6DF2196F, DF9B0AE9
+-repoviewurl = http://download.fedoraproject.org/pub/fedora-secondary/development/15/%(arch)s/os/
++repoviewurl = http://download.fedoraproject.org/pub/fedora-secondary/development/17/%(arch)s/os/
+ repoviewtitle = "Fedora Branched - %(arch)s"
+ arches = ppc ppc64
+ delta = True
++prefer_ppc64 = True
+ # Change distro_tags as fedora-release version gets bumped
+ distro_tags = cpe:/o:fedoraproject:fedora:17 rawhide
+ hash_packages = True
+diff --git a/configs/mash.ppc.conf b/configs/mash.ppc.conf
+index 74a5297..5146719 100644
+--- a/configs/mash.ppc.conf
++++ b/configs/mash.ppc.conf
+@@ -5,3 +5,4 @@ buildhost = http://ppc.koji.fedoraproject.org/kojihub
+ repodir = file:///mnt/koji
+ use_sqlite = True
+ use_repoview = False
++prefer_ppc64 = True
+--
+1.7.9.3
+
diff --git a/0002-set-the-repoviewurl-to-refleect-17-not-15.patch b/0002-set-the-repoviewurl-to-refleect-17-not-15.patch
new file mode 100644
index 0000000..2e29269
--- /dev/null
+++ b/0002-set-the-repoviewurl-to-refleect-17-not-15.patch
@@ -0,0 +1,67 @@
+From efbaf981aa91da261c272382259fbfa9fa4db3a9 Mon Sep 17 00:00:00 2001
+From: Dennis Gilmore <dennis at ausil.us>
+Date: Tue, 3 Apr 2012 10:53:47 -0500
+Subject: [PATCH 2/2] set the repoviewurl to refleect 17 not 15
+
+---
+ configs/branched.arm.mash | 2 +-
+ configs/branched.mash | 2 +-
+ configs/branched.s390.mash | 2 +-
+ configs/branched.sparc.mash | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/configs/branched.arm.mash b/configs/branched.arm.mash
+index 23f24a3..1d1b982 100644
+--- a/configs/branched.arm.mash
++++ b/configs/branched.arm.mash
+@@ -11,7 +11,7 @@ tag = f17
+ inherit = False
+ strict_keys = True
+ keys = 34E166FA, A82BA4B7, 069C8460, 97A1071F, E8E40FDE, 57BBCCBA, D22E77F2, 4EBFC273, 0B86274E, 6DF2196F, DF9B0AE9
+-repoviewurl = http://download.fedoraproject.org/pub/fedora-secondary/development/15/%(arch)s/os/
++repoviewurl = http://download.fedoraproject.org/pub/fedora-secondary/development/17/%(arch)s/os/
+ repoviewtitle = "Fedora Branched - %(arch)s"
+ arches = arm armhfp
+ delta = True
+diff --git a/configs/branched.mash b/configs/branched.mash
+index 68321a6..8203570 100644
+--- a/configs/branched.mash
++++ b/configs/branched.mash
+@@ -11,7 +11,7 @@ tag = f17
+ inherit = False
+ strict_keys = True
+ keys = 1ACA3465, A82BA4B7, 069C8460, 97A1071F, E8E40FDE, 57BBCCBA, D22E77F2, 4EBFC273, 0B86274E, 6DF2196F, DF9B0AE9
+-repoviewurl = http://download.fedoraproject.org/pub/fedora/linux/development/15/%(arch)s/os/
++repoviewurl = http://download.fedoraproject.org/pub/fedora/linux/development/17/%(arch)s/os/
+ repoviewtitle = "Fedora Branched - %(arch)s"
+ arches = i386 x86_64
+ delta = True
+diff --git a/configs/branched.s390.mash b/configs/branched.s390.mash
+index f4e98be..2d232a7 100644
+--- a/configs/branched.s390.mash
++++ b/configs/branched.s390.mash
+@@ -11,7 +11,7 @@ tag = f17
+ inherit = True
+ strict_keys = True
+ keys = 34E166FA, A82BA4B7, 069C8460, 97A1071F, E8E40FDE, 57BBCCBA, D22E77F2, 4EBFC273, 0B86274E, 6DF2196F, DF9B0AE9
+-repoviewurl = http://download.fedoraproject.org/pub/fedora-secondary/development/15/%(arch)s/os/
++repoviewurl = http://download.fedoraproject.org/pub/fedora-secondary/development/17/%(arch)s/os/
+ repoviewtitle = "Fedora Branched - %(arch)s"
+ arches = s390 s390x
+ delta = True
+diff --git a/configs/branched.sparc.mash b/configs/branched.sparc.mash
+index c67fca6..a0b8f71 100644
+--- a/configs/branched.sparc.mash
++++ b/configs/branched.sparc.mash
+@@ -11,7 +11,7 @@ tag = f17
+ inherit = False
+ strict_keys = True
+ keys = 34E166FA, A82BA4B7, 069C8460, 97A1071F, E8E40FDE, 57BBCCBA, D22E77F2, 4EBFC273, 0B86274E, 6DF2196F, DF9B0AE9
+-repoviewurl = http://download.fedoraproject.org/pub/fedora-secondary/development/15/%(arch)s/os/
++repoviewurl = http://download.fedoraproject.org/pub/fedora-secondary/development/17/%(arch)s/os/
+ repoviewtitle = "Fedora Branched - %(arch)s"
+ arches = sparc sparc64
+ delta = False
+--
+1.7.9.3
+
diff --git a/mash.spec b/mash.spec
index 2e6ff2c..d8289bc 100644
--- a/mash.spec
+++ b/mash.spec
@@ -2,7 +2,7 @@
Name: mash
Version: 0.5.26
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Koji buildsystem to yum repository converter
Group: Development/Tools
License: GPLv2
@@ -13,6 +13,8 @@ Requires: yum, createrepo, koji
Conflicts: pungi < 1.0.0
BuildRequires: python-devel
BuildArch: noarch
+Patch0: 0001-set-prefer_ppc64-to-true-on-ppc-configs.patch
+Patch1: 0002-set-the-repoviewurl-to-refleect-17-not-15.patch
%description
mash is a tool that queries a koji buildsystem for the latest RPMs for
@@ -21,6 +23,8 @@ any multlib RPMs that are necessary.
%prep
%setup -q
+%patch0 -p1
+%patch1 -p1
%build
%{__python} setup.py build
@@ -44,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
/var/cache/mash
%changelog
+* Tue Apr 03 2012 Dennis Gilmore <dennis at ausil.us> 0.5.26-2
+- pull in patches from upstream for secondary arch config fixes
+
* Thu Feb 09 2012 Dennis Gilmore <dennis at ausil.us> 0.5.26-1
- hash the branched repo
- use rawhide tag for rawhide not deprectated dist-rawhide
More information about the scm-commits
mailing list