epm repack.d/generic-post.sh: rename generic icon.png to product name in all package types

repack.d/generic-post.sh

@@ -75,11 +75,11 @@ for DESKTOPFILE in $BUILDROOT/usr/share/applications/*.desktop ; do
     ICON="$(get_desktop_value "$DESKTOPFILE" "Icon")"
 
     # rename generic icon.png to product name to avoid conflicts between packages
-    if [ "$ICON" = "icon" ] || [ "$ICON" = "icon.png" ] ; then
-        newicon="$PRODUCT"
-        if [ -f "$BUILDROOT/usr/share/pixmaps/icon.png" ] ; then
+    if [ -f "$BUILDROOT/usr/share/pixmaps/icon.png" ] ; then
+        if [ -z "$ICON" ] || [ "$ICON" = "icon" ] || [ "$ICON" = "icon.png" ] ; then
+            newicon="$PRODUCT"
             mv "$BUILDROOT/usr/share/pixmaps/icon.png" "$BUILDROOT/usr/share/pixmaps/$newicon.png"
-            subst "s|/usr/share/pixmaps/icon\.png|/usr/share/pixmaps/$newicon.png|" $SPEC
+            subst "s|icon\.png|$newicon.png|" $SPEC
             subst "s|^Icon=.*|Icon=$newicon|" "$DESKTOPFILE"
             ICON="$newicon"
         fi