diff --git a/0001-Turn-off-inheritance-in-rawhide-releng-4224.patch b/0001-Turn-off-inheritance-in-rawhide-releng-4224.patch new file mode 100644 index 0000000..7841725 --- /dev/null +++ b/0001-Turn-off-inheritance-in-rawhide-releng-4224.patch @@ -0,0 +1,27 @@ +From b8c97f67ca544196809abb2c77786ba0d83f35a2 Mon Sep 17 00:00:00 2001 +From: Jesse Keating +Date: Wed, 3 Nov 2010 11:04:24 -0700 +Subject: [PATCH] Turn off inheritance in rawhide (releng #4224) + +This was done due to an XZ change and how deltas work. See the ticket +for the sordid details. +--- + configs/rawhide.mash | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/configs/rawhide.mash b/configs/rawhide.mash +index a5291ef..a61634a 100644 +--- a/configs/rawhide.mash ++++ b/configs/rawhide.mash +@@ -8,7 +8,7 @@ debuginfo = True + multilib = True + multilib_method = devel + tag = dist-rawhide +-inherit = True ++inherit = False + strict_keys = False + keys = 97A1071F, E8E40FDE, 57BBCCBA, D22E77F2, 4EBFC273, 0B86274E, 6DF2196F, DF9B0AE9 + repoviewurl = http://download.fedoraproject.org/pub/fedora/linux/development/rawhide/%(arch)s/os/ +-- +1.7.3.1 + diff --git a/mash.spec b/mash.spec index f21cf4f..1deec13 100644 --- a/mash.spec +++ b/mash.spec @@ -2,7 +2,7 @@ Name: mash Version: 0.5.20 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Koji buildsystem to yum repository converter Group: Development/Tools License: GPL @@ -14,6 +14,7 @@ Conflicts: pungi < 1.0.0 BuildRequires: python-devel BuildArch: noarch Patch1: mash-nodelta.patch +Patch2: 0001-Turn-off-inheritance-in-rawhide-releng-4224.patch %description mash is a tool that queries a koji buildsystem for the latest RPMs for @@ -23,6 +24,7 @@ any multlib RPMs that are necessary. %prep %setup -q %patch1 -p1 +%patch2 -p1 %build %{__python} setup.py build @@ -46,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT /var/cache/mash %changelog +* Wed Nov 03 2010 Jesse Keating - 0.5.20-3 +- Turn off inheritance when compsing rawhide + * Thu Oct 28 2010 Bill Nottingham 0.5.20-2 - disable deltas