diff --git a/.gitignore b/.gitignore index b78476e..1a1d3df 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1 @@ -mash-0.5.18.tar.gz -mash-0.5.19.tar.gz -/mash-0.5.20.tar.gz +/mash-0.5.21.tar.gz diff --git a/0001-Turn-off-inheritance-in-rawhide-releng-4224.patch b/0001-Turn-off-inheritance-in-rawhide-releng-4224.patch deleted file mode 100644 index 71fc5b6..0000000 --- a/0001-Turn-off-inheritance-in-rawhide-releng-4224.patch +++ /dev/null @@ -1,28 +0,0 @@ -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 -+tag = dist-f15 --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/bd4feb3.patch b/bd4feb3.patch deleted file mode 100644 index ba48a4a..0000000 --- a/bd4feb3.patch +++ /dev/null @@ -1,19 +0,0 @@ -commit bd4feb3958990a1815535a07cddd82741457c1f3 -Author: Bill Nottingham -Date: Tue Nov 9 14:45:45 2010 -0500 - - Add gdk-pixbuf loader path. (#649339) - -diff --git a/mash/multilib.py b/mash/multilib.py -index 3219df9..9c221ca 100644 ---- a/mash/multilib.py -+++ b/mash/multilib.py -@@ -134,6 +134,8 @@ class RuntimeMultilibMethod(MultilibMethod): - # images - if fnmatch(dirname, '/usr/lib*/gtk-2.0/*/loaders'): - return True -+ if fnmatch(dirname, '/usr/lib*/gdk-pixbuf-2.0/*/loaders'): -+ return True - if fnmatch(dirname, '/usr/lib*/gtk-2.0/*/printbackends'): - return True - if fnmatch(dirname, '/usr/lib*/gtk-2.0/*/filesystems'): diff --git a/cc7f44.patch b/cc7f44.patch deleted file mode 100644 index 9b690ed..0000000 --- a/cc7f44.patch +++ /dev/null @@ -1,40 +0,0 @@ -commit cc7f44b6a0183ca07e437bb03020dfef64520c74 -Author: Bill Nottingham -Date: Thu Dec 2 15:00:43 2010 -0500 - - Add a 'prefer_ppc64' arch option () - -diff --git a/mash/__init__.py b/mash/__init__.py -index 8f5ff97..b1be033 100644 ---- a/mash/__init__.py -+++ b/mash/__init__.py -@@ -82,6 +82,9 @@ class Mash: - self.config = config - self.session = koji.ClientSession(config.buildhost, {}) - self._setupLogger() -+ if self.config.prefer_ppc64: -+ del masharch.biarch['ppc'] -+ masharch.biarch.setdefault('ppc64','ppc') - - def _setupLogger(self): - self.logger = logging.getLogger('mash') -diff --git a/mash/config.py b/mash/config.py -index 6508143..9b2351d 100644 ---- a/mash/config.py -+++ b/mash/config.py -@@ -49,6 +49,7 @@ class MashConfig(config.BaseConfig): - latest = config.BoolOption(True) - distro_tags = config.Option() - content_tags = config.ListOption() -+ prefer_ppc64 = config.BoolOption(False) - distros = [] - - class MashDistroConfig(config.BaseConfig): -@@ -83,6 +84,7 @@ class MashDistroConfig(config.BaseConfig): - latest = config.Inherit(MashConfig.latest) - distro_tags = config.Inherit(MashConfig.distro_tags) - content_tags = config.Inherit(MashConfig.content_tags) -+ prefer_ppc64 = config.Inherit(MashConfig.prefer_ppc64) - hash_packages = config.BoolOption(False) - parent_repos = config.ListOption() - previous = None diff --git a/mash-nodelta.patch b/mash-nodelta.patch deleted file mode 100644 index 82fd04a..0000000 --- a/mash-nodelta.patch +++ /dev/null @@ -1,11 +0,0 @@ -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 --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 cf247cb..87d7ab4 100644 --- a/mash.spec +++ b/mash.spec @@ -1,11 +1,11 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: mash -Version: 0.5.20 -Release: 8%{?dist} +Version: 0.5.21 +Release: 1%{?dist} Summary: Koji buildsystem to yum repository converter Group: Development/Tools -License: GPL +License: GPLv2 URL: http://fedorahosted.org/releases/m/a/mash/ Source0: http://fedorahosted.org/releases/m/a/mash/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -13,9 +13,6 @@ Requires: yum, createrepo, koji Conflicts: pungi < 1.0.0 BuildRequires: python-devel BuildArch: noarch -Patch2: 0001-Turn-off-inheritance-in-rawhide-releng-4224.patch -Patch3: bd4feb3.patch -Patch4: cc7f44.patch %description mash is a tool that queries a koji buildsystem for the latest RPMs for @@ -24,9 +21,6 @@ any multlib RPMs that are necessary. %prep %setup -q -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 %build %{__python} setup.py build @@ -50,24 +44,10 @@ rm -rf $RPM_BUILD_ROOT /var/cache/mash %changelog -* Tue Feb 08 2011 Fedora Release Engineering - 0.5.20-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Thu Dec 02 2010 Bill Nottingham - 0.5.20-7 +* Tue Feb 10 2011 Bill Nottingham 0.5.21-1 +- update configs for F15 () - add a knob for frobbing which ppc arch is preferred () - -* Tue Nov 09 2010 Bill Nottingham - 0.5.20-6 - fix gdk-pixbuf loader path (#649339) -- re-enable deltas - -* Thu Nov 04 2010 Bill Nottingham - 0.5.20-4 -- When doing so, pull from dist-f15, not dist-rawhide - -* 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 * Tue Sep 28 2010 Bill Nottingham 0.5.20-1 - solve multilib against parent repos if configured (#633136) diff --git a/sources b/sources index f149ee7..11ae8a9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -374d881a31121de61ad11fb12590f7e3 mash-0.5.20.tar.gz +b7eb3c4ecdb5fe18fef7a690bce96e41 mash-0.5.21.tar.gz