diff --git a/.gitignore b/.gitignore index 7bdf7dc..d7bc632 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /mash-0.5.29.tar.gz /mash-0.5.30.tar.gz +/mash-0.5.31.tar.gz diff --git a/0001-no-longer-mash-the-arm-tree-on-rawhide.patch b/0001-no-longer-mash-the-arm-tree-on-rawhide.patch deleted file mode 100644 index 8764ff0..0000000 --- a/0001-no-longer-mash-the-arm-tree-on-rawhide.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 7ae49b56628f812dc2c3e1d2f52135e70631f52b Mon Sep 17 00:00:00 2001 -From: Dennis Gilmore -Date: Tue, 29 Jan 2013 09:57:47 -0600 -Subject: [PATCH] no longer mash the arm tree on rawhide - ---- - configs/rawhide.arm.mash | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configs/rawhide.arm.mash b/configs/rawhide.arm.mash -index f2f5fe0..583920f 100644 ---- a/configs/rawhide.arm.mash -+++ b/configs/rawhide.arm.mash -@@ -13,7 +13,7 @@ strict_keys = False - keys = A4D647E9, F8DF67E6, 34E166FA, A82BA4B7, 069C8460, 97A1071F, E8E40FDE, 57BBCCBA, D22E77F2, 4EBFC273, 0B86274E, 6DF2196F, DF9B0AE9 - repoviewurl = http://download.fedoraproject.org/pub/fedora-secondary/development/rawhide/%(arch)s/os/ - repoviewtitle = "Fedora Rawhide - %(arch)s" --arches = arm armhfp -+arches = armhfp - delta = True - # Change distro_tags as fedora-release version gets bumped - distro_tags = cpe:/o:fedoraproject:fedora:19 rawhide --- -1.8.1 - diff --git a/7da2983.patch b/7da2983.patch deleted file mode 100644 index 84511ba..0000000 --- a/7da2983.patch +++ /dev/null @@ -1,18 +0,0 @@ -commit 7da2983ec779413e2735731fbba28dde6be064d9 (HEAD, origin/master, origin/HEAD, master) -Author: Bill Nottingham -Date: Wed Jul 25 16:05:14 2012 -0400 - - Fix crash (#843092) - -diff --git a/mash/multilib.py b/mash/multilib.py -index 8688810..830b3ad 100644 ---- a/mash/multilib.py -+++ b/mash/multilib.py -@@ -172,6 +172,7 @@ class DevelMultilibMethod(RuntimeMultilibMethod): - 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', - 'java-1.7.0-openjdk-devel' ] -+ whitelist = [] - if po.name in blacklist: - return False - if po.name in whitelist: diff --git a/mash-debug.patch b/mash-debug.patch deleted file mode 100644 index 0b6c28e..0000000 --- a/mash-debug.patch +++ /dev/null @@ -1,54 +0,0 @@ -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 deleted file mode 100644 index 11bcd00..0000000 --- a/mash-nodelta.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up mash-0.5.21/configs/rawhide.mash.foo mash-0.5.21/configs/rawhide.mash ---- mash-0.5.21/configs/rawhide.mash.foo 2011-04-04 17:22:18.000000000 -0400 -+++ mash-0.5.21/configs/rawhide.mash 2011-04-04 17:22:32.013000326 -0400 -@@ -14,6 +14,6 @@ keys = 069C8460, 97A1071F, E8E40FDE, 57B - 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:16 rawhide diff --git a/mash.spec b/mash.spec index 0057f76..91b43c1 100644 --- a/mash.spec +++ b/mash.spec @@ -1,14 +1,13 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: mash -Version: 0.5.30 -Release: 2%{?dist} +Version: 0.5.31 +Release: 1%{?dist} Summary: Koji buildsystem to yum repository converter Group: Development/Tools License: GPLv2 URL: http://fedorahosted.org/releases/m/a/mash/ Source0: http://fedorahosted.org/releases/m/a/mash/%{name}-%{version}.tar.gz -Patch0: 0001-no-longer-mash-the-arm-tree-on-rawhide.patch Requires: yum, createrepo, koji Conflicts: pungi < 1.0.0 BuildRequires: python-devel @@ -21,7 +20,6 @@ any multlib RPMs that are necessary. %prep %setup -q -%patch0 -p1 %build %{__python} setup.py build @@ -32,8 +30,6 @@ rm -rf $RPM_BUILD_ROOT mv $RPM_BUILD_ROOT/%{_bindir}/mash.py $RPM_BUILD_ROOT/%{_bindir}/mash mkdir -p $RPM_BUILD_ROOT/var/cache/mash -%clean -rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) @@ -45,11 +41,16 @@ rm -rf $RPM_BUILD_ROOT /var/cache/mash %changelog +* Tue Mar 12 2013 Dennis Gilmore - 0.5.31-1 +- setup branched for f19 and rawhide for f20 +- drop sparc configs +- arm is hfp only + * Tue Jan 29 2013 Dennis Gilmore - 0.5.30-2 - drop mashing arm rawhide, hfp only going forward -* Thu Aug 09 2012 Dennis Gilmore 0.5.30-1 -- setup branched and rawhide for f18 +* Thu Aug 09 2012 Dennis Gilmore 0.5.30-1 +- setup branched for f18 and rawhide for f19 * Wed Jul 25 2012 Bill Nottingham 0.5.29-2 - fix whitelist (#843092) diff --git a/sources b/sources index 86b38dd..94cc0d7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -76b565ce84a9d797b46e6afacc53fb59 mash-0.5.30.tar.gz +e87fe2516b8c84cd3ea6fe1c4a88c060 mash-0.5.31.tar.gz