diff --git a/fedora-atomic.conf b/fedora-atomic.conf index c13e272..e5dfbb0 100644 --- a/fedora-atomic.conf +++ b/fedora-atomic.conf @@ -128,9 +128,7 @@ filter_packages = [ multilib_blacklist = { '*': ['kernel*', 'kernel-PAE*', 'kernel*debug*', '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.8.0-openjdk-devel', + 'php-devel', 'java-*', 'httpd-devel', 'tomcat-native', 'php*', 'httpd', 'krb5-server', 'krb5-server-ldap', 'mod_*', 'ghc-*' ], diff --git a/fedora-cloud.conf b/fedora-cloud.conf index 60485f6..d3bb761 100644 --- a/fedora-cloud.conf +++ b/fedora-cloud.conf @@ -117,9 +117,7 @@ filter_packages = [ multilib_blacklist = { '*': ['kernel*', 'kernel-PAE*', 'kernel*debug*', '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.8.0-openjdk-devel', + 'php-devel', 'java-*', 'httpd-devel', 'tomcat-native', 'php*', 'httpd', 'krb5-server', 'krb5-server-ldap', 'mod_*', 'ghc-*' ], diff --git a/fedora-docker.conf b/fedora-docker.conf index 28b31da..afcecf6 100644 --- a/fedora-docker.conf +++ b/fedora-docker.conf @@ -117,9 +117,7 @@ filter_packages = [ multilib_blacklist = { '*': ['kernel*', 'kernel-PAE*', 'kernel*debug*', '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.8.0-openjdk-devel', + 'php-devel', 'java-*', 'httpd-devel', 'tomcat-native', 'php*', 'httpd', 'krb5-server', 'krb5-server-ldap', 'mod_*', 'ghc-*' ], diff --git a/fedora.conf b/fedora.conf index f2de390..7830136 100644 --- a/fedora.conf +++ b/fedora.conf @@ -168,9 +168,7 @@ filter_packages = [ multilib_blacklist = { '*': ['kernel', 'kernel-PAE*', 'kernel*debug*', '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.8.0-openjdk-devel', + 'php-devel', 'java-*', 'httpd-devel', 'tomcat-native', 'php*', 'httpd', 'krb5-server', 'krb5-server-ldap', 'mod_*', 'ghc-*' ],