1 files changed, 15 insertions, 7 deletions
diff --git a/system/apcupsd/apcupsd.SlackBuild b/system/apcupsd/apcupsd.SlackBuild
index 896d3fce21424..c69ac04df6e8a 100644
--- a/system/apcupsd/apcupsd.SlackBuild
+++ b/system/apcupsd/apcupsd.SlackBuild
@@ -22,6 +22,11 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220402 bkw: Modified by SlackBuilds.org, BUILD=3:
+# - don't install icons and .desktop files executable.
+# - fix desktop-file-validate warning.
+# - remove useless INSTALL instructions from doc dir.
+
 # Modified 3/3/2009 by Christopher Walker <kris240376@gmail.com>
 # * added log rotation
 
@@ -29,7 +34,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=apcupsd
 VERSION=${VERSION:-3.14.14}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -41,9 +46,6 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-# 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
@@ -78,9 +80,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 {} \+
 
 # Fixup up a couple of nitpicks in the init script
 patch -p1 < $CWD/patches/init-script-fixups.diff
@@ -123,6 +125,12 @@ CXXFLAGS="$SLKCFLAGS -DNETSNMP_NO_LEGACY_DEFINITIONS=1" \
 make
 make install DESTDIR=$PKG
 
+# 20220402 bkw: bad permissions, desktop-file-validate.
+chmod 644 $PKG/usr/share/{applications,pixmaps}/*
+sed -i -e '/^Categories/s,Application;,,' \
+       -e '/^Encoding/d' \
+       $PKG/usr/share/applications/*desktop
+
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
@@ -147,7 +155,7 @@ done
 rm -rf $PKG/usr/share/hal
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a COPYING ChangeLog DISCLAIMER Developers INSTALL ReleaseNotes \
+cp -a COPYING ChangeLog DISCLAIMER Developers ReleaseNotes \
   VERIFYING examples doc/* $CWD/README.SLACKWARE $CWD/$PRGNAM.SlackBuild \
     $PKG/usr/doc/$PRGNAM-$VERSION
 find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod 644 {} \;