From 9171b078d7103c69f3c45bb7c0d012027555e2c3 Mon Sep 17 00:00:00 2001
From: Jiri Vanek <jvanek@redhat.com>
Date: Tue, 21 Nov 2017 11:49:38 +0100
Subject: [PATCH] added another subdirs for policies files

---
 copy-jdk-configs.spec        | 5 ++++-
 copy_jdk_configs.lua         | 4 ++++
 copy_jdk_configs_fixFiles.sh | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/copy-jdk-configs.spec b/copy-jdk-configs.spec
index f8db366..c6466dd 100644
--- a/copy-jdk-configs.spec
+++ b/copy-jdk-configs.spec
@@ -8,7 +8,7 @@ Name:    copy-jdk-configs
 # hash relevant to version tag
 %global  htag f1cd4541f89ac601873ee16d6aa3b3cb1497f0d5
 Version: 3.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: JDKs configuration files copier
 
 License:  BSD
@@ -72,6 +72,9 @@ rm "%{rpm_state_dir}/%{file}" 2> /dev/null || :
 %license LICENSE
 
 %changelog
+* Wed Oct 18 2017 Jiri Vanek <jvanek@redhat.com> - 3.3-2
+- added another subdirs for policies files
+
 * Wed Oct 18 2017 Jiri Vanek <jvanek@redhat.com> - 3.3-1
 - handled new paths for policies files
 
diff --git a/copy_jdk_configs.lua b/copy_jdk_configs.lua
index 426efb3..1ec1321 100755
--- a/copy_jdk_configs.lua
+++ b/copy_jdk_configs.lua
@@ -16,11 +16,15 @@ local caredFiles = {"jre/lib/calendars.properties",
               "jre/lib/security/US_export_policy.jar",
               "jre/lib/security/unlimited/US_export_policy.jar",
               "jre/lib/security/limited/US_export_policy.jar",
+              "jre/lib/security/policy/unlimited/US_export_policy.jar",
+              "jre/lib/security/policy/limited/US_export_policy.jar",
               "jre/lib/security/java.policy",
               "jre/lib/security/java.security",
               "jre/lib/security/local_policy.jar",
               "jre/lib/security/unlimited/local_policy.jar",
               "jre/lib/security/limited/local_policy.jar",
+              "jre/lib/security/policy/unlimited/local_policy.jar",
+              "jre/lib/security/policy/limited/local_policy.jar",
               "jre/lib/security/nss.cfg",
               "jre/lib/security/cacerts",
               "jre/lib/security/blacklisted.certs",
diff --git a/copy_jdk_configs_fixFiles.sh b/copy_jdk_configs_fixFiles.sh
index d8d8838..767e2c3 100755
--- a/copy_jdk_configs_fixFiles.sh
+++ b/copy_jdk_configs_fixFiles.sh
@@ -179,7 +179,7 @@ files=`find $sourceSearchPath | grep "\\.rpmsave$"`
 #warning: file /usr/lib/jvm/java-1.8.0-openjdk-1.8.0.131-11.b12.el7.x86_64-debug/jre/lib/applet: remove failed: No such file or directory
 #warning: file /usr/lib/jvm/java-1.8.0-openjdk-1.8.0.131-11.b12.el7.x86_64-debug/jre/lib/amd64/client: remove failed: No such file or directory
 #those dirs might be mepty by installtion, filling to not be rmeoved later
-blackdirs="$source/jre/lib/applet $source/jre/lib/*/client"
+blackdirs="$source/jre/lib/applet $source/jre/lib/*/client $source/jre/lib/locale/*/LC_MESSAGE"
 for blackdir in $blackdirs; do
   if [ -e $blackdir ] ; then
     debug "nasty $blackdir  exists, filling"