From 843bc98ccd7f93026ab033a9ecc993acf9363e1b Mon Sep 17 00:00:00 2001
From: Petar Petrov <slackalaxy@gmail.com>
Date: Fri, 5 Aug 2022 21:36:31 +0100
Subject: academic/fiji: Updated for version 20220414_1745.

Signed-off-by: Dave Woodfall <dave@slackbuilds.org>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 academic/fiji/ImageJ2.desktop |  2 +-
 academic/fiji/fiji.SlackBuild | 22 +++++-----------------
 academic/fiji/fiji.info       | 10 +++++-----
 3 files changed, 11 insertions(+), 23 deletions(-)

diff --git a/academic/fiji/ImageJ2.desktop b/academic/fiji/ImageJ2.desktop
index 6ea0bc5041..404207c1ec 100644
--- a/academic/fiji/ImageJ2.desktop
+++ b/academic/fiji/ImageJ2.desktop
@@ -2,7 +2,7 @@
 Name=Fiji (ImageJ 2)
 Comment=Fiji is just ImageJ
 Type=Application
-Categories=Graphics;
+Categories=Graphics;Education;
 Exec=fiji
 Terminal=false
 Icon=fiji
diff --git a/academic/fiji/fiji.SlackBuild b/academic/fiji/fiji.SlackBuild
index 9f97499f69..6ab84821d4 100644
--- a/academic/fiji/fiji.SlackBuild
+++ b/academic/fiji/fiji.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for fiji
 
-# Copyright 2018-2021 Petar Petrov slackalaxy@gmail.com
+# Copyright 2018-2022 Petar Petrov slackalaxy@gmail.com
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,7 +25,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=fiji
-VERSION=${VERSION:-20201104_1356}
+VERSION=${VERSION:-20220414_1745}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -60,18 +60,11 @@ if [ "$ARCH" != "i386" ] && [ "$ARCH" != "x86_64" ]; then
   exit 1
 fi
 
-# Determine suffix
-if [ "$ARCH" = "x86_64" ]; then
-  SUFFIX=linux64
-else
-  SUFFIX=linux32
-fi
-
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $DIRNAM
-tar xvf $CWD/${PRGNAM}-$SUFFIX.tar.gz
+tar xvf $CWD/${PRGNAM}-linux64.tar.gz
 cd $DIRNAM
 chown -R root:root .
 find -L . \
@@ -81,7 +74,7 @@ find -L . \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 # Rename the binary we need
-mv ImageJ-$SUFFIX $PRGNAM
+mv ImageJ-linux64 $PRGNAM
 
 # We will put here two tools, so they are not run at startup.
 mkdir -p unused
@@ -114,6 +107,7 @@ cp -a \
   jars \
   java \
   lib \
+  licenses \
   luts \
   macros \
   plugins \
@@ -123,12 +117,6 @@ cp -a \
   $PRGNAM \
 $PKG/opt/$PRGNAM
 
-if [ "$ARCH" = "x86_64" ]; then
-  cp -a \
-    licenses \
-  $PKG/opt/$PRGNAM
-fi
-
 # If a file called "ImageJ2.desktop" is not present in the directory
 # of fiji, it will create (and re-create it if you delete it) the file
 # "~/.local/share/applications/ImageJ2.desktop" upon start. So, let it
diff --git a/academic/fiji/fiji.info b/academic/fiji/fiji.info
index 9e3928ff4b..2ef38b8348 100644
--- a/academic/fiji/fiji.info
+++ b/academic/fiji/fiji.info
@@ -1,10 +1,10 @@
 PRGNAM="fiji"
-VERSION="20201104_1356"
+VERSION="20220414_1745"
 HOMEPAGE="https://fiji.sc/"
-DOWNLOAD="https://downloads.imagej.net/fiji/archive/20201104-1356/fiji-linux32.tar.gz"
-MD5SUM="bff409ed4b683d67e3b3ac0d38423f0d"
-DOWNLOAD_x86_64="https://downloads.imagej.net/fiji/archive/20201104-1356/fiji-linux64.tar.gz"
-MD5SUM_x86_64="7141a774a0c759f6fea0875a6cbf58b9"
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="https://downloads.imagej.net/fiji/archive/20220414-1745/fiji-linux64.tar.gz"
+MD5SUM_x86_64="db39b9a0b2d4e1693151a018f7cb237e"
 REQUIRES=""
 MAINTAINER="Petar Petrov"
 EMAIL="slackalaxy@gmail.com"
-- 
cgit v1.2.3