From 7e58d5af0ab8d70a0c0ff9539bbab2892658fcc1 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Nov 09 2010 20:06:00 +0000 Subject: Merge branch 'master' into el5 --- 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..71fc5b6 --- /dev/null +++ b/0001-Turn-off-inheritance-in-rawhide-releng-4224.patch @@ -0,0 +1,28 @@ +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 new file mode 100644 index 0000000..ba48a4a --- /dev/null +++ b/bd4feb3.patch @@ -0,0 +1,19 @@ +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/mash-debug.patch b/mash-debug.patch new file mode 100644 index 0000000..0b6c28e --- /dev/null +++ b/mash-debug.patch @@ -0,0 +1,54 @@ +diff --git a/mash/metadata.py b/mash/metadata.py +index 56bb377..b381833 100644 +--- a/mash/metadata.py ++++ b/mash/metadata.py +@@ -113,21 +113,26 @@ class MetadataNew: + return True + + def _matches(file, list): ++ self.logger.info("Checking drpm %s" % (file,)) + hdr = rpmUtils.miscutils.hdrFromPackage(ts, file) + fname = '%s-%s-%s.%s.rpm' % (hdr['name'], hdr['version'], hdr['release'], hdr['arch']) + if fname in list.keys(): + if _sigmatches(hdr, list[fname]): ++ self.logger.info("Finished checking drpm %s - success" % (file,)) + return True ++ self.logger.info("Finished checking drpm %s - fail" % (file,)) + return False + + def _copy(file, path): + if not os.path.exists('%s/drpms' % (path,)): + os.mkdir('%s/drpms' % (path,)) + destpath = '%s/drpms/%s' % (path, os.path.basename(file)) ++ self.logger.info("Copying drpm %s" % (file,)) + try: + os.link(file, destpath) + except OSError: + shutil.copy(file, destpath) ++ self.logger.info("Finished copying drpm %s" % (file,)) + + fulllist = self.repomatic.getFileList(self.conf.directory, '.rpm') + filelist = {} +@@ -150,7 +155,10 @@ class MetadataNew: + except OSError: + self.logger.error("Couldn't copy repodata from %s" % (self.previous,)) + if self.conf.deltas: ++ self.logger.info("Starting to copy old deltas for %s" % (path,)) + self._copy_in_deltas(path) ++ self.logger.info("Finished copying old deltas for %s" % (path,)) ++ self.logger.info("Creating metadata for %s" % (path,)) + self.repomatic.doPkgMetadata() + self.repomatic.doRepoMetadata() + self.repomatic.doFinalMove() +diff --git a/mash/metadata.py b/mash/metadata.py +index 938172a..59069c8 100644 +--- a/mash/metadata.py ++++ b/mash/metadata.py +@@ -68,6 +68,7 @@ class MetadataNew: + self.conf.update = True + self.conf.quiet = True + self.conf.unique_md_filenames = True ++ self.conf.profile = True + self.previous = None + self.logger = logger + diff --git a/mash-nodelta.patch b/mash-nodelta.patch new file mode 100644 index 0000000..82fd04a --- /dev/null +++ b/mash-nodelta.patch @@ -0,0 +1,11 @@ +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 e6e9cba..c775cb8 100644 --- a/mash.spec +++ b/mash.spec @@ -2,7 +2,7 @@ Name: mash Version: 0.5.20 -Release: 1%{?dist} +Release: 6%{?dist} Summary: Koji buildsystem to yum repository converter Group: Development/Tools License: GPL @@ -13,6 +13,8 @@ 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 %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 +%patch2 -p1 +%patch3 -p1 %build %{__python} setup.py build @@ -44,6 +48,19 @@ rm -rf $RPM_BUILD_ROOT /var/cache/mash %changelog +* 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) - fix traceback when only binary RPMS exist (modified from #636697, )