--- a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxRpmBundler.java	Tue Dec 18 19:31:20 2018 -0500
+++ b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxRpmBundler.java	Fri Dec 21 07:40:47 2018 -0500
@@ -25,8 +25,6 @@
 
 package jdk.jpackage.internal;
 
-import jdk.jpackage.internal.resources.LinuxResources;
-
 import javax.imageio.ImageIO;
 import java.awt.image.BufferedImage;
 import java.io.*;
@@ -163,11 +161,6 @@
     public final static String TOOL_RPMBUILD = "rpmbuild";
     public final static double TOOL_RPMBUILD_MIN_VERSION = 4.0d;
 
-    public LinuxRpmBundler() {
-        super();
-        baseResourceLoader = LinuxResources.class;
-    }
-
     public static boolean testTool(String toolName, double minVersion) {
         try (ByteArrayOutputStream baos = new ByteArrayOutputStream();
                 PrintStream ps = new PrintStream(baos)) {
@@ -352,21 +345,19 @@
         File icon = LinuxAppBundler.ICON_PNG.fetchFrom(params);
         if (!Arguments.CREATE_JRE_INSTALLER.fetchFrom(params)) {
             if (icon == null || !icon.exists()) {
-                fetchResource(LinuxAppBundler.BUNDLER_PREFIX
-                        + iconTarget.getName(),
+                fetchResource(iconTarget.getName(),
                         I18N.getString("resource.menu-icon"),
                         DEFAULT_ICON,
                         iconTarget,
                         VERBOSE.fetchFrom(params),
-                        DROP_IN_RESOURCES_ROOT.fetchFrom(params));
+                        RESOURCE_DIR.fetchFrom(params));
             } else {
-                fetchResource(LinuxAppBundler.BUNDLER_PREFIX
-                        + iconTarget.getName(),
+                fetchResource(iconTarget.getName(),
                         I18N.getString("resource.menu-icon"),
                         icon,
                         iconTarget,
                         VERBOSE.fetchFrom(params),
-                        DROP_IN_RESOURCES_ROOT.fetchFrom(params));
+                        RESOURCE_DIR.fetchFrom(params));
             }
         }
 
@@ -384,13 +375,12 @@
             Writer w = new BufferedWriter(new FileWriter(
                     getConfig_DesktopShortcutFile(rootDir, secondaryLauncher)));
             String content = preprocessTextResource(
-                    LinuxAppBundler.BUNDLER_PREFIX
-                            + getConfig_DesktopShortcutFile(rootDir,
-                                    secondaryLauncher).getName(),
+                    getConfig_DesktopShortcutFile(rootDir,
+                    secondaryLauncher).getName(),
                     I18N.getString("resource.menu-shortcut-descriptor"),
                     DEFAULT_DESKTOP_FILE_TEMPLATE, secondaryLauncherData,
                     VERBOSE.fetchFrom(params),
-                    DROP_IN_RESOURCES_ROOT.fetchFrom(params));
+                    RESOURCE_DIR.fetchFrom(params));
             w.write(content);
             w.close();
 
@@ -398,21 +388,19 @@
             iconTarget = getConfig_IconFile(rootDir, secondaryLauncher);
             icon = LinuxAppBundler.ICON_PNG.fetchFrom(secondaryLauncher);
             if (icon == null || !icon.exists()) {
-                fetchResource(LinuxAppBundler.BUNDLER_PREFIX
-                        + iconTarget.getName(),
+                fetchResource(iconTarget.getName(),
                         I18N.getString("resource.menu-icon"),
                         DEFAULT_ICON,
                         iconTarget,
                         VERBOSE.fetchFrom(params),
-                        DROP_IN_RESOURCES_ROOT.fetchFrom(params));
+                        RESOURCE_DIR.fetchFrom(params));
             } else {
-                fetchResource(LinuxAppBundler.BUNDLER_PREFIX
-                        + iconTarget.getName(),
+                fetchResource(iconTarget.getName(),
                         I18N.getString("resource.menu-icon"),
                         icon,
                         iconTarget,
                         VERBOSE.fetchFrom(params),
-                        DROP_IN_RESOURCES_ROOT.fetchFrom(params));
+                        RESOURCE_DIR.fetchFrom(params));
             }
 
             // post copying of desktop icon
@@ -588,13 +576,11 @@
             Writer w = new BufferedWriter(new FileWriter(
                     getConfig_DesktopShortcutFile(rootDir, params)));
             String content = preprocessTextResource(
-                    LinuxAppBundler.BUNDLER_PREFIX
-                            + getConfig_DesktopShortcutFile(rootDir,
-                                    params).getName(),
+                    getConfig_DesktopShortcutFile(rootDir, params).getName(),
                     I18N.getString("resource.menu-shortcut-descriptor"),
                     DEFAULT_DESKTOP_FILE_TEMPLATE, data,
                     VERBOSE.fetchFrom(params),
-                    DROP_IN_RESOURCES_ROOT.fetchFrom(params));
+                    RESOURCE_DIR.fetchFrom(params));
             w.write(content);
             w.close();
         }
@@ -603,12 +589,11 @@
         Writer w = new BufferedWriter(
                 new FileWriter(getConfig_SpecFile(params)));
         String content = preprocessTextResource(
-                LinuxAppBundler.BUNDLER_PREFIX
-                        + getConfig_SpecFile(params).getName(),
+                getConfig_SpecFile(params).getName(),
                 I18N.getString("resource.rpm-spec-file"),
                 DEFAULT_SPEC_TEMPLATE, data,
                 VERBOSE.fetchFrom(params),
-                DROP_IN_RESOURCES_ROOT.fetchFrom(params));
+                RESOURCE_DIR.fetchFrom(params));
         w.write(content);
         w.close();