diff --git a/0001-add-java-1.7.0-openjdk-devel-to-the-multilib-blackli.patch b/0001-add-java-1.7.0-openjdk-devel-to-the-multilib-blackli.patch new file mode 100644 index 0000000..623fe54 --- /dev/null +++ b/0001-add-java-1.7.0-openjdk-devel-to-the-multilib-blackli.patch @@ -0,0 +1,26 @@ +From b1a3a1162d002f036219d721c9ed244f764c8351 Mon Sep 17 00:00:00 2001 +From: Dennis Gilmore +Date: Tue, 8 May 2012 21:23:32 -0500 +Subject: [PATCH] add java-1.7.0-openjdk-devel to the multilib blacklist + +--- + mash/multilib.py | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/mash/multilib.py b/mash/multilib.py +index 4e64b88..e1d0971 100644 +--- a/mash/multilib.py ++++ b/mash/multilib.py +@@ -170,7 +170,8 @@ class DevelMultilibMethod(RuntimeMultilibMethod): + self.name = 'devel' + + 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' ] ++ 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 = ['glibc-static', 'libstdc++-static'] + if po.name in blacklist: + return False +-- +1.7.10.1 + diff --git a/mash.spec b/mash.spec index af20053..13f63a9 100644 --- a/mash.spec +++ b/mash.spec @@ -2,7 +2,7 @@ Name: mash Version: 0.5.26 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Koji buildsystem to yum repository converter Group: Development/Tools License: GPLv2 @@ -16,6 +16,7 @@ BuildArch: noarch Patch0: 0001-set-prefer_ppc64-to-true-on-ppc-configs.patch Patch1: 0002-set-the-repoviewurl-to-refleect-17-not-15.patch Patch2: 0001-add-the-f17-secondary-key-id-to-the-secopndary-arch-.patch +Patch3: 0001-add-java-1.7.0-openjdk-devel-to-the-multilib-blackli.patch %description mash is a tool that queries a koji buildsystem for the latest RPMs for @@ -27,6 +28,7 @@ any multlib RPMs that are necessary. %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build %{__python} setup.py build @@ -50,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT /var/cache/mash %changelog +* Tue May 08 2012 Dennis Gilmore 0.5.26-4 +- blacklist java-1.7.0-openjdk-devel from multilib + * Mon Apr 09 2012 Dennis Gilmore 0.5.26-3 - make sure secondary arch branched configs have the right key