[mash] Disable deltas (they're broken currently.)

Bill Nottingham notting at fedoraproject.org
Thu Oct 28 18:14:56 UTC 2010


commit 4d218ef2ecf5cd0aa078c9e44b43a6bd4a71ff10
Author: Bill Nottingham <notting at redhat.com>
Date:   Thu Oct 28 14:14:13 2010 -0400

    Disable deltas (they're broken currently.)

 mash-nodelta.patch |   15 ++++++++-------
 mash.spec          |    7 ++++++-
 2 files changed, 14 insertions(+), 8 deletions(-)
---
diff --git a/mash-nodelta.patch b/mash-nodelta.patch
index 11b4539..82fd04a 100644
--- a/mash-nodelta.patch
+++ b/mash-nodelta.patch
@@ -1,10 +1,11 @@
-diff -up mash-0.5.8/configs/rawhide.mash.foo mash-0.5.8/configs/rawhide.mash
---- mash-0.5.8/configs/rawhide.mash.foo	2009-06-16 16:04:26.000000000 -0400
-+++ mash-0.5.8/configs/rawhide.mash	2009-07-24 10:08:02.000000000 -0400
-@@ -14,4 +14,5 @@ keys = D22E77F2, 4EBFC273, 0B86274E, 6DF
- repoviewurl = http://download.fedoraproject.org/pub/fedora/linux/development/%(arch)s/os/
+diff -up mash-0.5.20/configs/rawhide.mash.orig mash-0.5.20/configs/rawhide.mash
+--- mash-0.5.20/configs/rawhide.mash.orig	2010-07-30 12:28:21.000000000 -0400
++++ mash-0.5.20/configs/rawhide.mash	2010-10-28 14:10:42.187929029 -0400
+@@ -14,6 +14,6 @@ keys = 97A1071F, E8E40FDE, 57BBCCBA, D22
+ repoviewurl = http://download.fedoraproject.org/pub/fedora/linux/development/rawhide/%(arch)s/os/
  repoviewtitle = "Fedora Rawhide - %(arch)s"
- arches = i386 x86_64 ppc ppc64
+ arches = i386 x86_64
 -delta = True
 +delta = False
-+
+ # Change distro_tags as fedora-release version gets bumped
+ distro_tags = cpe:/o:fedoraproject:fedora:15 rawhide
diff --git a/mash.spec b/mash.spec
index e6e9cba..f21cf4f 100644
--- a/mash.spec
+++ b/mash.spec
@@ -2,7 +2,7 @@
 
 Name:           mash
 Version:        0.5.20
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Koji buildsystem to yum repository converter
 Group:          Development/Tools
 License:        GPL
@@ -13,6 +13,7 @@ Requires:       yum, createrepo, koji
 Conflicts:	pungi < 1.0.0
 BuildRequires:  python-devel
 BuildArch:      noarch
+Patch1:		mash-nodelta.patch
 
 %description
 mash is a tool that queries a koji buildsystem for the latest RPMs for
@@ -21,6 +22,7 @@ any multlib RPMs that are necessary.
 
 %prep
 %setup -q
+%patch1 -p1
 
 %build
 %{__python} setup.py build
@@ -44,6 +46,9 @@ rm -rf $RPM_BUILD_ROOT
 /var/cache/mash
 
 %changelog
+* Thu Oct 28 2010 Bill Nottingham <notting at redhat.com> 0.5.20-2
+- disable deltas
+
 * Tue Sep 28 2010 Bill Nottingham <notting at redhat.com> 0.5.20-1
 - solve multilib against parent repos if configured (#633136)
 - fix traceback when only binary RPMS exist (modified from #636697, <tguthmann at iseek.com.au>)


More information about the scm-commits mailing list