From 94e519b6f13bf4501e3cdb12d22c4b8ada9c6525 Mon Sep 17 00:00:00 2001 From: Willy Sudiarto Raharjo Date: Fri, 4 Mar 2022 14:25:51 +0700 Subject: [PATCH] colord: Fix path. Signed-off-by: Willy Sudiarto Raharjo --- colord/colord.SlackBuild | 3 ++- colord/doinst.sh | 12 ++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/colord/colord.SlackBuild b/colord/colord.SlackBuild index 084ac5e..5f82267 100644 --- a/colord/colord.SlackBuild +++ b/colord/colord.SlackBuild @@ -24,7 +24,7 @@ PRGNAM=colord VERSION=${VERSION:-1.4.6} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_csb} if [ -z "$ARCH" ]; then @@ -119,6 +119,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr # Fix paths sed -i "s|/lib|/lib${LIBDIRSUFFIX}|g" $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig/colord.pc sed -i "s|/lib|/lib${LIBDIRSUFFIX}|g" $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig/colorhug.pc +mv $PKG/usr/share/dbus-1/system.d/org.freedesktop.ColorManager.conf $PKG/usr/share/dbus-1/system.d/org.freedesktop.ColorManager.conf.new mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a AUTHORS COPYING* MAINTAINERS $PKG/usr/doc/$PRGNAM-$VERSION diff --git a/colord/doinst.sh b/colord/doinst.sh index e259094..314350e 100644 --- a/colord/doinst.sh +++ b/colord/doinst.sh @@ -1,3 +1,15 @@ +config() { + NEW="$1" + OLD="$(dirname $NEW)/$(basename $NEW .new)" + if [ ! -r $OLD ]; then + mv $NEW $OLD + elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then + rm $NEW + fi +} + +config usr/share/dbus-1/system.d/org.freedesktop.ColorManager.conf.new + if [ -e usr/share/glib-2.0/schemas ]; then if [ -x /usr/bin/glib-compile-schemas ]; then /usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas >/dev/null 2>&1