diff --git a/.gitignore b/.gitignore index 1bfd41f..5bf33f2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1 @@ -/mash-0.5.21.tar.gz -/mash-0.5.22.tar.gz -/mash-0.5.23.tar.gz -/mash-0.5.24.tar.gz -/mash-0.5.25.tar.gz -/mash-0.5.26.tar.gz +/mash-0.5.27.tar.gz diff --git a/0001-add-java-1.7.0-openjdk-devel-to-the-multilib-blackli.patch b/0001-add-java-1.7.0-openjdk-devel-to-the-multilib-blackli.patch deleted file mode 100644 index 623fe54..0000000 --- a/0001-add-java-1.7.0-openjdk-devel-to-the-multilib-blackli.patch +++ /dev/null @@ -1,26 +0,0 @@ -From b1a3a1162d002f036219d721c9ed244f764c8351 Mon Sep 17 00:00:00 2001 -From: Dennis Gilmore -Date: Tue, 8 May 2012 21:23:32 -0500 -Subject: [PATCH] add java-1.7.0-openjdk-devel to the multilib blacklist - ---- - mash/multilib.py | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/mash/multilib.py b/mash/multilib.py -index 4e64b88..e1d0971 100644 ---- a/mash/multilib.py -+++ b/mash/multilib.py -@@ -170,7 +170,8 @@ class DevelMultilibMethod(RuntimeMultilibMethod): - self.name = 'devel' - - def select(self, po): -- blacklist = ['dmraid-devel', 'kdeutils-devel', 'mkinitrd-devel', 'java-1.5.0-gcj-devel', 'java-1.7.0-icedtea-devel', 'php-devel', 'java-1.6.0-openjdk-devel' ] -+ blacklist = ['dmraid-devel', 'kdeutils-devel', 'mkinitrd-devel', 'java-1.5.0-gcj-devel', 'java-1.7.0-icedtea-devel', 'php-devel', 'java-1.6.0-openjdk-devel', -+ 'java-1.7.0-openjdk-devel' ] - whitelist = ['glibc-static', 'libstdc++-static'] - if po.name in blacklist: - return False --- -1.7.10.1 - diff --git a/0001-add-the-f17-secondary-key-id-to-the-secopndary-arch-.patch b/0001-add-the-f17-secondary-key-id-to-the-secopndary-arch-.patch deleted file mode 100644 index 3079901..0000000 --- a/0001-add-the-f17-secondary-key-id-to-the-secopndary-arch-.patch +++ /dev/null @@ -1,68 +0,0 @@ -From f07c842597b569834fe9fcd04ee33b856d002d96 Mon Sep 17 00:00:00 2001 -From: Dennis Gilmore -Date: Mon, 9 Apr 2012 15:35:26 -0500 -Subject: [PATCH] add the f17-secondary key id to the secopndary arch branched - configs - ---- - configs/branched.arm.mash | 2 +- - configs/branched.ppc.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 1d1b982..caf59c1 100644 ---- a/configs/branched.arm.mash -+++ b/configs/branched.arm.mash -@@ -10,7 +10,7 @@ multilib_method = devel - tag = f17 - inherit = False - strict_keys = True --keys = 34E166FA, A82BA4B7, 069C8460, 97A1071F, E8E40FDE, 57BBCCBA, D22E77F2, 4EBFC273, 0B86274E, 6DF2196F, DF9B0AE9 -+keys = 34E166FA, F8DF67E6, A82BA4B7, 069C8460, 97A1071F, E8E40FDE, 57BBCCBA, D22E77F2, 4EBFC273, 0B86274E, 6DF2196F, DF9B0AE9 - repoviewurl = http://download.fedoraproject.org/pub/fedora-secondary/development/17/%(arch)s/os/ - repoviewtitle = "Fedora Branched - %(arch)s" - arches = arm armhfp -diff --git a/configs/branched.ppc.mash b/configs/branched.ppc.mash -index 0d0bd08..dd0190a 100644 ---- a/configs/branched.ppc.mash -+++ b/configs/branched.ppc.mash -@@ -10,7 +10,7 @@ multilib_method = devel - tag = f17 - inherit = False - strict_keys = True --keys = 34E166FA, A82BA4B7, 069C8460, 97A1071F, E8E40FDE, 57BBCCBA, D22E77F2, 4EBFC273, 0B86274E, 6DF2196F, DF9B0AE9 -+keys = 34E166FA, F8DF67E6, A82BA4B7, 069C8460, 97A1071F, E8E40FDE, 57BBCCBA, D22E77F2, 4EBFC273, 0B86274E, 6DF2196F, DF9B0AE9 - repoviewurl = http://download.fedoraproject.org/pub/fedora-secondary/development/17/%(arch)s/os/ - repoviewtitle = "Fedora Branched - %(arch)s" - arches = ppc ppc64 -diff --git a/configs/branched.s390.mash b/configs/branched.s390.mash -index 2d232a7..2a816b6 100644 ---- a/configs/branched.s390.mash -+++ b/configs/branched.s390.mash -@@ -10,7 +10,7 @@ multilib_method = devel - tag = f17 - inherit = True - strict_keys = True --keys = 34E166FA, A82BA4B7, 069C8460, 97A1071F, E8E40FDE, 57BBCCBA, D22E77F2, 4EBFC273, 0B86274E, 6DF2196F, DF9B0AE9 -+keys = 34E166FA, F8DF67E6, A82BA4B7, 069C8460, 97A1071F, E8E40FDE, 57BBCCBA, D22E77F2, 4EBFC273, 0B86274E, 6DF2196F, DF9B0AE9 - repoviewurl = http://download.fedoraproject.org/pub/fedora-secondary/development/17/%(arch)s/os/ - repoviewtitle = "Fedora Branched - %(arch)s" - arches = s390 s390x -diff --git a/configs/branched.sparc.mash b/configs/branched.sparc.mash -index a0b8f71..5537926 100644 ---- a/configs/branched.sparc.mash -+++ b/configs/branched.sparc.mash -@@ -10,7 +10,7 @@ multilib_method = kernel - tag = f17 - inherit = False - strict_keys = True --keys = 34E166FA, A82BA4B7, 069C8460, 97A1071F, E8E40FDE, 57BBCCBA, D22E77F2, 4EBFC273, 0B86274E, 6DF2196F, DF9B0AE9 -+keys = 34E166FA, F8DF67E6, A82BA4B7, 069C8460, 97A1071F, E8E40FDE, 57BBCCBA, D22E77F2, 4EBFC273, 0B86274E, 6DF2196F, DF9B0AE9 - repoviewurl = http://download.fedoraproject.org/pub/fedora-secondary/development/17/%(arch)s/os/ - repoviewtitle = "Fedora Branched - %(arch)s" - arches = sparc sparc64 --- -1.7.9.3 - diff --git a/0001-set-prefer_ppc64-to-true-on-ppc-configs.patch b/0001-set-prefer_ppc64-to-true-on-ppc-configs.patch deleted file mode 100644 index 5b92772..0000000 --- a/0001-set-prefer_ppc64-to-true-on-ppc-configs.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 5c5a65ee439456dc744f97222dff528bb887eb6c Mon Sep 17 00:00:00 2001 -From: Dennis Gilmore -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 deleted file mode 100644 index 2e29269..0000000 --- a/0002-set-the-repoviewurl-to-refleect-17-not-15.patch +++ /dev/null @@ -1,67 +0,0 @@ -From efbaf981aa91da261c272382259fbfa9fa4db3a9 Mon Sep 17 00:00:00 2001 -From: Dennis Gilmore -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/35eae6232b985faec7a137a3ab5af03fddc27b78.patch b/35eae6232b985faec7a137a3ab5af03fddc27b78.patch deleted file mode 100644 index e80592b..0000000 --- a/35eae6232b985faec7a137a3ab5af03fddc27b78.patch +++ /dev/null @@ -1,64 +0,0 @@ -commit 35eae6232b985faec7a137a3ab5af03fddc27b78 -Author: Bill Nottingham -Date: Thu Jan 5 15:18:22 2012 -0500 - - Add some basic support for overriding mail from/to addresses. (#739166) - -diff --git a/utils/spam-o-matic b/utils/spam-o-matic -index a1cbc98..ba9e059 100755 ---- a/utils/spam-o-matic -+++ b/utils/spam-o-matic -@@ -21,6 +21,9 @@ import repoclosure - owners = {} - deps = {} - -+owner_template = "%s-owner@fedoraproject.org" -+from_address = "buildsys@fedoraproject.org" -+ - def generateConfig(distdir, treename, arch): - if not os.path.exists(os.path.join(distdir, arch)): - return None -@@ -67,7 +70,7 @@ def addOwner(list, pkg): - if list.has_key(pkg): - return False - -- f = "%s-owner@fedoraproject.org" % pkg -+ f = owner_template % pkg - list[pkg] = f - if f: - return True -@@ -153,7 +156,7 @@ def generateSpam(pkgname, treename, sendmail = True): - - data = data + "Please resolve this as soon as possible.\n\n" - -- fromaddr = 'buildsys@fedoraproject.org' -+ fromaddr = from_address - toaddrs = [guilty] - if conspirators: - toaddrs = toaddrs + conspirators -@@ -244,8 +247,14 @@ def doit(dir, treename, mail=True): - if __name__ == '__main__': - - parser = OptionParser("usage: %prog [options] ") -- parser.add_option("--nomail", action="store_true") -- parser.add_option("--treename", default="rawhide") -+ parser.add_option("--nomail", action="store_true", -+ help="Don't mail the results") -+ parser.add_option("--treename", default="rawhide", -+ help="Name of the tree to use in messages") -+ parser.add_option("--fromaddr", default="buildsys@fedoraproject.org", -+ help="Address to send mail from (default: buildsys@fedoraproject.org)") -+ parser.add_option("--owneraddr", default="%s-owner@fedoraproject.org", -+ help="Template for package owner addresses to send mail to (default: %s-owner@fedoraproject.org)") - (options, args) = parser.parse_args(sys.argv[1:]) - if len(args) != 1: - parser.error("incorrect number of arguments") -@@ -254,4 +263,8 @@ if __name__ == '__main__': - mail = False - else: - mail = True -+ if options.fromaddr: -+ from_address = options.fromaddr -+ if options.owneraddr: -+ owner_template = options.owneraddr - doit(args[0], options.treename, mail) diff --git a/mash-keys.patch b/mash-keys.patch deleted file mode 100644 index ca49784..0000000 --- a/mash-keys.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -up mash-0.5.21/configs/branched.mash.old mash-0.5.21/configs/branched.mash ---- mash-0.5.21/configs/branched.mash.old 2011-02-17 17:24:16.470732001 -0500 -+++ mash-0.5.21/configs/branched.mash 2011-02-17 17:24:33.753732001 -0500 -@@ -10,7 +10,7 @@ multilib_method = devel - tag = dist-f15 - inherit = False - strict_keys = True --keys = 97A1071F, E8E40FDE, 57BBCCBA, D22E77F2, 4EBFC273, 0B86274E, 6DF2196F, DF9B0AE9, 069C8460 -+keys = 069C8460, 97A1071F, E8E40FDE, 57BBCCBA, D22E77F2, 4EBFC273, 0B86274E, 6DF2196F, DF9B0AE9 - repoviewurl = http://download.fedoraproject.org/pub/fedora/linux/development/15/%(arch)s/os/ - repoviewtitle = "Fedora Branched - %(arch)s" - arches = i386 x86_64 -diff -up mash-0.5.21/configs/rawhide.mash.old mash-0.5.21/configs/rawhide.mash ---- mash-0.5.21/configs/rawhide.mash.old 2011-02-10 21:43:46.000000000 -0500 -+++ mash-0.5.21/configs/rawhide.mash 2011-02-17 17:24:45.364732002 -0500 -@@ -10,7 +10,7 @@ multilib_method = devel - tag = dist-rawhide - inherit = True - strict_keys = False --keys = 97A1071F, E8E40FDE, 57BBCCBA, D22E77F2, 4EBFC273, 0B86274E, 6DF2196F, DF9B0AE9, 069C8460 -+keys = 069C8460, 97A1071F, E8E40FDE, 57BBCCBA, D22E77F2, 4EBFC273, 0B86274E, 6DF2196F, DF9B0AE9 - repoviewurl = http://download.fedoraproject.org/pub/fedora/linux/development/rawhide/%(arch)s/os/ - repoviewtitle = "Fedora Rawhide - %(arch)s" - arches = i386 x86_64 diff --git a/mash-new.patch b/mash-new.patch deleted file mode 100644 index 5440ca7..0000000 --- a/mash-new.patch +++ /dev/null @@ -1,110 +0,0 @@ -From dennis@ausil.us Tue Jul 26 09:22:28 2011 -Return-Path: -Received: from nostromo.devel.redhat.com (nostromo.devel.redhat.com [127.0.0.1]) - by nostromo.devel.redhat.com (8.14.5/8.14.4) with ESMTP id p6QDInD3022249 - for ; Tue, 26 Jul 2011 09:22:28 -0400 -Received: from mail.corp.redhat.com [10.5.5.52] - by nostromo.devel.redhat.com with IMAP (fetchmail-6.3.20) - for (single-drop); Tue, 26 Jul 2011 09:22:28 -0400 (EDT) -Received: from zmta02.collab.prod.int.phx2.redhat.com (LHLO - zmta02.collab.prod.int.phx2.redhat.com) (10.5.5.32) by - mail03.corp.redhat.com with LMTP; Tue, 26 Jul 2011 01:57:42 -0400 (EDT) -Received: from localhost (localhost.localdomain [127.0.0.1]) - by zmta02.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 492EB129FCA - for ; Tue, 26 Jul 2011 01:57:42 -0400 (EDT) -X-Quarantine-ID: -Received: from zmta02.collab.prod.int.phx2.redhat.com ([127.0.0.1]) - by localhost (zmta02.collab.prod.int.phx2.redhat.com [127.0.0.1]) (amavisd-new, port 10024) - with ESMTP id S5JBNnhfJY8Y for ; - Tue, 26 Jul 2011 01:57:42 -0400 (EDT) -Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) - by zmta02.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 3419F129FB2 - for ; Tue, 26 Jul 2011 01:57:42 -0400 (EDT) -Received: from mx1.redhat.com (ext-mx14.extmail.prod.ext.phx2.redhat.com [10.5.110.19]) - by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p6Q5vg48018203 - for ; Tue, 26 Jul 2011 01:57:42 -0400 -Received: from mail.ausil.us (mail.ausil.us [74.119.218.133]) - by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p6Q5vck4008603 - for ; Tue, 26 Jul 2011 01:57:38 -0400 -Received: from localhost (unknown [127.0.0.1]) - by mail.ausil.us (Postfix) with ESMTP id EAF4364813E; - Tue, 26 Jul 2011 06:03:09 +0000 (UTC) -X-Virus-Scanned: amavisd-new at mail.ausil.us -Received: from mail.ausil.us ([127.0.0.1]) - by localhost (mail.ausil.us [127.0.0.1]) (amavisd-new, port 10024) - with ESMTP id 2-vI7em4pc2J; Tue, 26 Jul 2011 06:03:05 +0000 (UTC) -Received: from pegasus.ausil.us (osiris.ausil.us [75.149.73.105]) - by mail.ausil.us (Postfix) with ESMTP id D393D6480DF; - Tue, 26 Jul 2011 06:03:04 +0000 (UTC) -From: Dennis Gilmore -To: notting@redhat.com -Cc: Dennis Gilmore -Subject: [PATCH] update mash configs for new tags, keys and the next releases -Date: Tue, 26 Jul 2011 00:58:29 -0500 -Message-Id: <1311659909-6228-1-git-send-email-dennis@ausil.us> -In-Reply-To: -References: -X-RedHat-Spam-Score: -1.191 (RP_MATCHES_RCVD) -X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 -X-Scanned-By: MIMEDefang 2.68 on 10.5.110.19 -Status: RO -Content-Length: 1972 - ---- - configs/branched.mash | 8 ++++---- - configs/rawhide.mash | 6 +++--- - 2 files changed, 7 insertions(+), 7 deletions(-) - -diff --git a/configs/branched.mash b/configs/branched.mash -index c59a062..f4f9530 100644 ---- a/configs/branched.mash -+++ b/configs/branched.mash -@@ -1,19 +1,19 @@ - # mash config file - --[15] -+[16] - rpm_path = %(arch)s/os/Packages - repodata_path = %(arch)s/os/ - source_path = source/SRPMS - debuginfo = True - multilib = True - multilib_method = devel --tag = dist-f15 -+tag = f16 - inherit = False - strict_keys = True --keys = 069C8460, 97A1071F, E8E40FDE, 57BBCCBA, D22E77F2, 4EBFC273, 0B86274E, 6DF2196F, DF9B0AE9 -+keys = A82BA4B7, 069C8460, 97A1071F, E8E40FDE, 57BBCCBA, D22E77F2, 4EBFC273, 0B86274E, 6DF2196F, DF9B0AE9 - repoviewurl = http://download.fedoraproject.org/pub/fedora/linux/development/15/%(arch)s/os/ - repoviewtitle = "Fedora Branched - %(arch)s" - arches = i386 x86_64 - delta = True - # Change distro_tags as fedora-release version gets bumped --distro_tags = cpe:/o:fedoraproject:fedora:15 rawhide -+distro_tags = cpe:/o:fedoraproject:fedora:16 rawhide -diff --git a/configs/rawhide.mash b/configs/rawhide.mash -index 0d05428..b5d2ff8 100644 ---- a/configs/rawhide.mash -+++ b/configs/rawhide.mash -@@ -7,13 +7,13 @@ source_path = source/SRPMS - debuginfo = True - multilib = True - multilib_method = devel --tag = dist-rawhide -+tag = dist-rawhide - inherit = True - strict_keys = False --keys = 069C8460, 97A1071F, E8E40FDE, 57BBCCBA, D22E77F2, 4EBFC273, 0B86274E, 6DF2196F, DF9B0AE9 -+keys = A82BA4B7, 069C8460, 97A1071F, E8E40FDE, 57BBCCBA, D22E77F2, 4EBFC273, 0B86274E, 6DF2196F, DF9B0AE9 - repoviewurl = http://download.fedoraproject.org/pub/fedora/linux/development/rawhide/%(arch)s/os/ - repoviewtitle = "Fedora Rawhide - %(arch)s" - arches = i386 x86_64 - delta = True - # Change distro_tags as fedora-release version gets bumped --distro_tags = cpe:/o:fedoraproject:fedora:16 rawhide -+distro_tags = cpe:/o:fedoraproject:fedora:17 rawhide --- -1.7.6 - - diff --git a/mash.spec b/mash.spec index 13f63a9..d6c135e 100644 --- a/mash.spec +++ b/mash.spec @@ -1,8 +1,8 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: mash -Version: 0.5.26 -Release: 4%{?dist} +Version: 0.5.27 +Release: 1%{?dist} Summary: Koji buildsystem to yum repository converter Group: Development/Tools License: GPLv2 @@ -13,10 +13,6 @@ 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 -Patch2: 0001-add-the-f17-secondary-key-id-to-the-secopndary-arch-.patch -Patch3: 0001-add-java-1.7.0-openjdk-devel-to-the-multilib-blackli.patch %description mash is a tool that queries a koji buildsystem for the latest RPMs for @@ -25,10 +21,6 @@ any multlib RPMs that are necessary. %prep %setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 %build %{__python} setup.py build @@ -52,6 +44,9 @@ rm -rf $RPM_BUILD_ROOT /var/cache/mash %changelog +* Thu Jun 21 2012 Bill Nottingham 0.5.27-1 +- explicitly whitelist redhat-lsb, to handle packaging changes thereof + * Tue May 08 2012 Dennis Gilmore 0.5.26-4 - blacklist java-1.7.0-openjdk-devel from multilib diff --git a/sources b/sources index 7fbcd89..38ac636 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1b5ecf30b6bd57dcd56be809189e1dd7 mash-0.5.26.tar.gz +5f6bf56aa2eaf903d5f937588ccb412c mash-0.5.27.tar.gz