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 new file mode 100644 index 0000000..98339ea --- /dev/null +++ b/0001-blacklist-java-1.8.0-openjdk-devel-from-multilib.patch @@ -0,0 +1,25 @@ +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 deeaad3..db14c4a 100644 --- a/mash.spec +++ b/mash.spec @@ -2,7 +2,7 @@ Name: mash Version: 0.6.01 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Koji buildsystem to yum repository converter Group: Development/Tools License: GPLv2 @@ -13,6 +13,8 @@ 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 any particular tag, and creates repositories of those RPMs, including @@ -20,6 +22,7 @@ any multlib RPMs that are necessary. %prep %setup -q +%patch0 -p1 %build %{__python} setup.py build @@ -41,6 +44,9 @@ mkdir -p $RPM_BUILD_ROOT/var/cache/mash /var/cache/mash %changelog +* Sun Oct 20 2013 Dennis Gilmore - 0.6.01-2 +- add patch so that java-1.8.0-openjdk is not multilibbed + * Wed Aug 21 2013 Dennis Gilmore - 0.6.01-1 - set config defaults for max_delta_rpm_size