diff --git a/.gitignore b/.gitignore index cb8222c..9b2cb3b 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /mash-0.5.34.tar.gz /mash-0.6.00.tar.gz /mash-0.6.01.tar.gz +/mash-0.6.02.tar.gz diff --git a/0001-blacklist-java-1.8.0-openjdk-devel-from-multilib.patch b/0001-blacklist-java-1.8.0-openjdk-devel-from-multilib.patch deleted file mode 100644 index 98339ea..0000000 --- a/0001-blacklist-java-1.8.0-openjdk-devel-from-multilib.patch +++ /dev/null @@ -1,25 +0,0 @@ -From e1abfefd957d6ab31162d72c2fe7b5e59477b0fd Mon Sep 17 00:00:00 2001 -From: Dennis Gilmore -Date: Sun, 20 Oct 2013 06:24:38 -0500 -Subject: [PATCH] blacklist java-1.8.0-openjdk-devel from multilib - ---- - mash/multilib.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/mash/multilib.py b/mash/multilib.py -index 3763e65..a90e067 100644 ---- a/mash/multilib.py -+++ b/mash/multilib.py -@@ -180,7 +180,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' ] -+ 'java-1.7.0-openjdk-devel', 'java-1.8.0-openjdk-devel' ] - whitelist = [] - if po.name in blacklist: - return False --- -1.8.3.1 - diff --git a/mash.spec b/mash.spec index db14c4a..5ea3e0b 100644 --- a/mash.spec +++ b/mash.spec @@ -1,8 +1,8 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: mash -Version: 0.6.01 -Release: 2%{?dist} +Version: 0.6.02 +Release: 1%{?dist} Summary: Koji buildsystem to yum repository converter Group: Development/Tools License: GPLv2 @@ -13,7 +13,6 @@ Conflicts: pungi < 1.0.0 BuildRequires: python-devel BuildArch: noarch -Patch0: 0001-blacklist-java-1.8.0-openjdk-devel-from-multilib.patch %description mash is a tool that queries a koji buildsystem for the latest RPMs for @@ -22,7 +21,6 @@ any multlib RPMs that are necessary. %prep %setup -q -%patch0 -p1 %build %{__python} setup.py build @@ -44,6 +42,13 @@ mkdir -p $RPM_BUILD_ROOT/var/cache/mash /var/cache/mash %changelog +* Wed Dec 11 2013 Dennis Gilmore - 0.6.02-1 +- add --no-delta command line +- multilib blacklist java-1.8.0-openjdk +- enable vdpsu drivers as multilib +- enable qt5 and qml as multilib +- fail mash if pointed at non existant config file + * Sun Oct 20 2013 Dennis Gilmore - 0.6.01-2 - add patch so that java-1.8.0-openjdk is not multilibbed diff --git a/sources b/sources index f820914..7325a49 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fd7e7fad2547b5089c16b9174fc37bbe mash-0.6.01.tar.gz +96f909eacfd8779dc1971ceed731c49f mash-0.6.02.tar.gz