From 61191492ca3df6cc2b31bbc7a4f090a35794f77d Mon Sep 17 00:00:00 2001
From: "B. Watson" <yalhcru@gmail.com>
Date: Fri, 8 Apr 2022 13:22:07 -0400
Subject: development/avr8-burn-o-mat: Make noarch, fix .desktop.

Signed-off-by: B. Watson <yalhcru@gmail.com>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 .../avr8-burn-o-mat/avr8-burn-o-mat.SlackBuild     | 40 ++++++----------------
 1 file changed, 11 insertions(+), 29 deletions(-)

(limited to 'development/avr8-burn-o-mat/avr8-burn-o-mat.SlackBuild')

diff --git a/development/avr8-burn-o-mat/avr8-burn-o-mat.SlackBuild b/development/avr8-burn-o-mat/avr8-burn-o-mat.SlackBuild
index 1832d2ef90..f2378b331c 100644
--- a/development/avr8-burn-o-mat/avr8-burn-o-mat.SlackBuild
+++ b/development/avr8-burn-o-mat/avr8-burn-o-mat.SlackBuild
@@ -4,26 +4,21 @@
 
 # Written by Andrzej Telszewski <atelszewski@gmail.com>
 
+# 20220408 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - make noarch (it's java with no JNI).
+# - fix .desktop file.
+
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM="avr8-burn-o-mat"
 SRCNAM="AVR8_Burn-O-Mat"
 VERSION=${VERSION:-2.1.2}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
+ARCH=noarch
 
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
 if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
   echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
   exit 0
@@ -33,20 +28,6 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
 set -e
 
 rm -rf $PKG
@@ -59,9 +40,9 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 mkdir -p $PKG/usr/bin
 mkdir -p $PKG/usr/share/{avr8-burn-o-mat,applications,pixmaps}
@@ -74,8 +55,9 @@ cp -a AVR8_Burn-O-Mat.png $PKG/usr/share/avr8-burn-o-mat
 cp -a icon/AVR8_Burn-O-Mat_Icon_16.png $PKG/usr/share/avr8-burn-o-mat
 cp -a "Installer Debian/avr8-burn-o-mat" $PKG/usr/bin
 cp -a icon/AVR8_Burn-O-Mat_Icon_48.png $PKG/usr/share/pixmaps/avr8-burn-o-mat.png
-cp -a "Installer Debian/avr8-burn-o-mat.desktop" $PKG/usr/share/applications
-sed -i 's/'REPLACE_PROG_VERSION'/'$VERSION'/g' $PKG/usr/share/applications/avr8-burn-o-mat.desktop
+
+# 20220408 bkw: use a .desktop file that passes desktop-file-validate.
+cat $CWD/avr8-burn-o-mat.desktop > $PKG/usr/share/applications/avr8-burn-o-mat.desktop
 
 cp -a license_gpl-3.0.txt $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-- 
cgit v1.2.3