aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfourtysixandtwo <fourtysixandtwo@sliderr.net>2024-04-29 16:32:08 -0600
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2024-05-04 21:45:32 +0700
commitd87c5c7a9de931b251bda66399a6e3e8397ef317 (patch)
treea68d87da7d685fcb8281a878d20c55ae545938c4
parent9963ceacc9bbae1750114e66f78df98c0ad5ef39 (diff)
downloadslackbuilds-d87c5c7a9de931b251bda66399a6e3e8397ef317.tar.xz
system/Solaar: Fix building on -current.
With permission from Erich. Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-rw-r--r--system/Solaar/Solaar.SlackBuild8
1 files changed, 6 insertions, 2 deletions
diff --git a/system/Solaar/Solaar.SlackBuild b/system/Solaar/Solaar.SlackBuild
index e7d077043f..b739b40052 100644
--- a/system/Solaar/Solaar.SlackBuild
+++ b/system/Solaar/Solaar.SlackBuild
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=Solaar
VERSION=${VERSION:-1.1.11}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -68,7 +68,11 @@ find -L . \
python3 setup.py install --root=$PKG
-mv $PKG/usr/lib $PKG/
+# 20240429 46and2: make sure to only move the udev dir to $PKG/lib/
+# and remove $PKG/usr/lib if empty.
+mkdir $PKG/lib
+mv $PKG/usr/lib/udev $PKG/lib/
+rmdir --ignore-fail-on-non-empty $PKG/usr/lib
sed -i 's/#MODE="0660", GROUP="plugdev"/MODE="0660", GROUP="plugdev"/g' $PKG/lib/udev/rules.d/42-logitech-unify-permissions.rules
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION