From ea44831becb157c1dfd45b927de10bc48020a28c Mon Sep 17 00:00:00 2001
From: Matteo Bernardini
Date: Mon, 28 Jan 2019 11:37:44 +0100
Subject: desktop/lxmenu-data: Various cleanups.

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
---
 desktop/lxmenu-data/README                 |  2 --
 desktop/lxmenu-data/lxmenu-data.SlackBuild | 22 ++++++++++------------
 desktop/lxmenu-data/slack-desc             |  2 +-
 3 files changed, 11 insertions(+), 15 deletions(-)

(limited to 'desktop/lxmenu-data')

diff --git a/desktop/lxmenu-data/README b/desktop/lxmenu-data/README
index 4f1e243c88..1f45af9994 100644
--- a/desktop/lxmenu-data/README
+++ b/desktop/lxmenu-data/README
@@ -1,5 +1,3 @@
-lxmenu-data (desktop menus for LXDE)
-
 This package provides files required to build freedesktop.org menu
 spec-compliant desktop menus for LXDE.  The files are originally taken
 from gnome-menus, and some minor modifications were made.  lxmenu-data
diff --git a/desktop/lxmenu-data/lxmenu-data.SlackBuild b/desktop/lxmenu-data/lxmenu-data.SlackBuild
index b5d21a2e00..6d06f71e82 100644
--- a/desktop/lxmenu-data/lxmenu-data.SlackBuild
+++ b/desktop/lxmenu-data/lxmenu-data.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 # $Id$
 # Copyright (c) 2009  Eric Hameleers, Eindhoven, NL
-# Copyright 2010-2016 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
+# Copyright 2010-2019 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
 # All rights reserved.
 #
 #   Permission to use, copy, modify, and distribute this software for
@@ -58,21 +58,19 @@ TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-DOCS="AUTHORS COPYING README TODO"
-
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -85,6 +83,8 @@ else
   LIBDIRSUFFIX=""
 fi
 
+DOCS="AUTHORS COPYING README TODO"
+
 set -e
 
 rm -rf $PKG
@@ -95,10 +95,10 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.?z
 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 \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -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 {} \;
 
 sh autogen.sh || true
 
@@ -120,8 +120,6 @@ make install-strip DESTDIR=$PKG
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION || true
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-chown -R root:root $PKG/usr/doc/$PRGNAM-$VERSION
-find $PKG/usr/doc -type f -exec chmod 644 {} \;
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/desktop/lxmenu-data/slack-desc b/desktop/lxmenu-data/slack-desc
index 7997827d22..f9460861c7 100644
--- a/desktop/lxmenu-data/slack-desc
+++ b/desktop/lxmenu-data/slack-desc
@@ -14,6 +14,6 @@ lxmenu-data: The files are originally taken from gnome-menus, and some minor
 lxmenu-data: modifications were made.
 lxmenu-data: lxmenu-data package is required by lxpanel and lxlauncher.
 lxmenu-data:
+lxmenu-data: homepage: https://www.lxde.org/
 lxmenu-data:
-lxmenu-data: lxmenu-data home: https://www.lxde.org/
 lxmenu-data:
-- 
cgit v1.2.3