small cleanup

repack.d/atom-beta.sh

@@ -5,6 +5,7 @@ BUILDROOT="$1"
 SPEC="$2"
 
 PRODUCT=atom
+PRODUCTDIR=/usr/share/atom-beta
 
 # TODO: /usr/share/atom-beta -> /usr/lib64/atom-beta
 
@@ -51,5 +52,5 @@ epm install --skip-installed coreutils findutils git-core glib2 grep libalsa lib
             libcairo libcups libdbus libdrm libexpat libgbm libgdk-pixbuf libgio libgtk+3 libnspr libnss libpango libsecret \
             libX11 libxcb libXcomposite libXdamage libXext libXfixes libxkbcommon libxkbfile libXrandr \
             sed /usr/bin/git /usr/bin/node /usr/bin/npm /usr/bin/npx util-linux which xprop \
-            node python3
+            node python3 rpm-build-python3
 # enlightenment exo-utils seamonkey

repack.d/common-chromium-browser.sh

@@ -43,27 +43,25 @@ copy_icons_to_share()
 }
 
 
+remove_file()
+{
+    local file="$1"
+    [ -f $BUILDROOT/$file ] || return
+
+    rm -f $BUILDROOT/$file
+    subst "s|.*$file.*||" $SPEC
+}
+
 cleanup()
 {
     subst '1iAutoProv:no' $SPEC
 
     # remove cron update
-    if [ -r $BUILDROOT/etc/cron.daily/$PRODUCTCUR ] ; then
-        rm -f $BUILDROOT/etc/cron.daily/$PRODUCTCUR
-        subst 's|.*/etc/cron.daily/.*||' $SPEC
-    fi
-
-    if [ -r $BUILDROOT/etc/cron.daily/$PRODUCT ] ; then
-        rm -f $BUILDROOT/etc/cron.daily/$PRODUCT
-        subst 's|.*/etc/cron.daily/.*||' $SPEC
-    fi
+    remove_file /etc/cron.daily/$PRODUCTCUR
+    remove_file /etc/cron.daily/$PRODUCT
 
     # remove unsupported file
-    if [ -r $BUILDROOT/usr/share/menu/*.menu ] ; then
-        rm -f $BUILDROOT/usr/share/menu/*.menu
-        subst "s|.*/usr/share/menu/.*.menu.*||" $SPEC
-    fi
-
+    remove_file /usr/share/menu/$PRODUCT.menu
 }