From 49d1899a96b08d24c463cb2cbeb0669d146fa0b3 Mon Sep 17 00:00:00 2001
From: Zhu Qun-Ying
Date: Mon, 15 Jun 2020 12:03:48 -0700
Subject: misc/OSCAR: Updated for version 1.1.1.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 misc/OSCAR/OSCAR.SlackBuild | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

(limited to 'misc/OSCAR/OSCAR.SlackBuild')

diff --git a/misc/OSCAR/OSCAR.SlackBuild b/misc/OSCAR/OSCAR.SlackBuild
index abd11023e8..eb58726ca5 100644
--- a/misc/OSCAR/OSCAR.SlackBuild
+++ b/misc/OSCAR/OSCAR.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for OSCAR
 
-# Copyright 2019 Zhu, Qun-Ying
+# Copyright 2019-2020 Zhu, Qun-Ying
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=OSCAR
-VERSION=${VERSION:-1.0.1}
+VERSION=${VERSION:-1.1.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -56,7 +56,7 @@ fi
 
 set -e
 
-PRGSRC_NAME=$PRGNAM-code-v$VERSION-Release-1
+PRGSRC_NAME=$PRGNAM-code-v$VERSION
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
@@ -66,20 +66,24 @@ cd $PRGSRC_NAME
 chown -R root:root .
 mkdir build
 (cd build; CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" \
- qmake-qt5 ../OSCAR_QT.pro; make)
+    qmake-qt5 ../OSCAR_QT.pro; make $JOBS)
 
 mkdir -p $PKG/usr/bin
 strip --strip-unneeded build/oscar/OSCAR
 cp build/oscar/OSCAR $PKG/usr/bin
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a Htmldocs CONTRIBUTING.md README COPYING $PKG/usr/doc/$PRGNAM-$VERSION
+cp CONTRIBUTING.md README COPYING $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
-mkdir -p $PKG/usr/share/icons
+mkdir -p $PKG/usr/share/icons/hicolor/48x48/apps
 mkdir -p $PKG/usr/share/applications
-cp Installers/Linux/OSCAR.png $PKG/usr/share/icons
-cp Installers/Linux/OSCAR.desktop $PKG/usr/share/applications
+mkdir -p $PKG/usr/share/$PRGNAM
+
+cp Building/Linux/OSCAR.png $PKG/usr/share/icons/hicolor/48x48/apps
+cp Building/Linux/OSCAR.desktop $PKG/usr/share/applications
+cp -a build/oscar/Translations $PKG/usr/share/$PRGNAM
+cp -a build/oscar/Html $PKG/usr/share/$PRGNAM
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
-- 
cgit v1.2.3