From 799e9e84fba1dbd001325414316001f548407e2c Mon Sep 17 00:00:00 2001 From: "B. Watson" Date: Mon, 4 Apr 2022 16:10:34 -0400 Subject: [PATCH] system/byobu: Fix doc dir and .desktop. Signed-off-by: B. Watson --- system/byobu/byobu.SlackBuild | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/system/byobu/byobu.SlackBuild b/system/byobu/byobu.SlackBuild index c70334575e..4e7c749eb0 100644 --- a/system/byobu/byobu.SlackBuild +++ b/system/byobu/byobu.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. +# 20220404 bkw: Modified by SlackBuilds.org, BUILD=2: +# - remove empty /usr/share/doc from package. +# - remove 0-byte NEWS from doc dir. +# - make .desktop file validate. + cd $(dirname $0) ; CWD=$(pwd) PRGNAM=byobu VERSION=${VERSION:-2.82} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -38,9 +43,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 @@ -50,7 +52,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -DOCS="AUTHORS COPYING NEWS README" +# 20220404 bkw: NEWS is a 0-byte placeholder. +DOCS="AUTHORS COPYING README" if [ "$ARCH" = "x86_64" ]; then LIBDIRSUFFIX="64" @@ -73,9 +76,9 @@ patch -p1 < $CWD/slackware.diff 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 \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \+ if [ "$ARCH" = "x86_64" ]; then find usr -type f -exec sed -i -e "s/lib/lib${LIBDIRSUFFIX}/g" \{\} \; @@ -96,8 +99,12 @@ mv $PKG/usr/share/man $PKG/usr/ find $PKG/usr/man -type f -exec gzip -9 {} \; for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done +# 20220404 bkw: deprecation warning from desktop-file-validate. +sed -i '/^Encoding/d' $PKG/usr/share/applications/$PRGNAM.desktop + mkdir -p $PKG/usr/doc mv $PKG/usr/share/doc/$PRGNAM $PKG/usr/doc/$PRGNAM-$VERSION +rm -rf $PKG/usr/share/doc # 20220404 bkw: empty dir cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild