development/SQLiteStudio: Fix bad symlinks and chown/chmod stuff.

Signed-off-by: B. Watson <urchlay@slackware.uk>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

2 files changed, 16 insertions, 15 deletions

diff --git a/development/SQLiteStudio/README b/development/SQLiteStudio/README
index 1be729e955..55203ab9f8 100644
--- a/development/SQLiteStudio/README
+++ b/development/SQLiteStudio/README
@@ -1,13 +1,13 @@
 SQLiteStudio is a free, open source, multi-platform SQLite database
-manager writtenin C++, with use of Qt framework. It is a desktop
+manager written in C++, with use of Qt framework. It is a desktop
 application for browsing and editing SQLite database files, aimed
 for people who know what SQLite is, or what relational databases
 are in general.
 
 SQLiteStudio was created and is maintained by Pawel Salawa with
-contribution from the community.
+contributions from the community.
 
-It is an open-source software, released under GPL (v3) license.
+It is open-source software, released under GPL (v3) license.
 You are free to use it for any purpose you like.
 
 Homepage: https://sqlitestudio.pl/
diff --git a/development/SQLiteStudio/SQLiteStudio.SlackBuild b/development/SQLiteStudio/SQLiteStudio.SlackBuild
index ba03e1efeb..9f945fbd5f 100644
--- a/development/SQLiteStudio/SQLiteStudio.SlackBuild
+++ b/development/SQLiteStudio/SQLiteStudio.SlackBuild
@@ -22,11 +22,16 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20230627 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - get rid of libkrb5*.so symlinks; the app uses the ones in /usr/lib64.
+# - fix a few typos in the README.
+# - don't chown and chmod all of /tmp/SBo.
+
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=SQLiteStudio
 VERSION=${VERSION:-3.4.3}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 BASENAME=${BASENAME:-sqlitestudio}
@@ -44,20 +49,17 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
   exit 0
 fi
 
+# 20230627 bkw: SLKCFLAGS not needed (qmake handles it correctly).
 if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
   QMAKE=/usr/lib/qt5/bin/qmake
 elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
   LIBDIRSUFFIX=""
   QMAKE=/usr/lib/qt5/bin/qmake
 elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
   QMAKE=/usr/lib64/qt5/bin/qmake
 else
-  SLKCFLAGS="-O2"
   LIBDIRSUFFIX=""
   QMAKE=/usr/lib/qt5/bin/qmake
 fi
@@ -73,13 +75,14 @@ mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 
 tar xvfz $CWD/$BASENAME-$VERSION.tar.gz
+cd $BUILDDIR
 
 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 {} +
 
 # build program
 mkdir -p $BUILDDIR/output/build $BUILDDIR/output/build/Plugins
@@ -107,13 +110,11 @@ cp $CWD/SQLiteStudio.png $PKG/usr/share/pixmaps/SQLiteStudio.png
 mkdir -p $PKG/usr/share/applications
 cp $CWD/SQLiteStudio.desktop $PKG/usr/share/applications
 
-# fix broken symlinks
+# remove broken symlinks
 (
  cd $PKG/opt/SQLiteStudio/lib
- for lnk in libk5crypto.so.3.1 libkrb5.so.3.3 libkrb5support.so.0.1 \
-   libk5crypto.so.3 libkrb5.so.3 libkrb5support.so.0; do
-   rm -fv $lnk ; ln -s ../../../../../lib$LIBDIRSUFFIX/$lnk $lnk
- done
+ rm -f libk5crypto.so* libkrb5.so* libkrb5support.so* \
+   libk5crypto.so* libkrb5.so* libkrb5support.so*
 )
 
 # create additonal program symlinks