From 666af309bdb8c7e3a72a6cb0932aacd1daf8a09c Mon Sep 17 00:00:00 2001 From: Sergei Reznikov Date: Wed, 21 Nov 2018 17:19:43 +0300 Subject: [PATCH] Revert "dbus: add post-install script. fixes #3366." This should be reworked to use the launch daemon instead. This reverts commit 422a07316abad93fe40159c5512072b4eb68e4f1. --- .../dbus/additional-files/start_dbus_launch.sh | 10 ---------- .../{dbus-1.12.10.recipe => dbus-1.12.6.recipe} | 15 +++++---------- 2 files changed, 5 insertions(+), 20 deletions(-) delete mode 100755 sys-apps/dbus/additional-files/start_dbus_launch.sh rename sys-apps/dbus/{dbus-1.12.10.recipe => dbus-1.12.6.recipe} (90%) diff --git a/sys-apps/dbus/additional-files/start_dbus_launch.sh b/sys-apps/dbus/additional-files/start_dbus_launch.sh deleted file mode 100755 index f28de3cce..000000000 --- a/sys-apps/dbus/additional-files/start_dbus_launch.sh +++ /dev/null @@ -1,10 +0,0 @@ -#/bin/sh - -eval `dbus-launch --auto-syntax` - -if grep -q dbus-launch /boot/home/config/settings/boot/UserBootscript -then - exit 0 -else - echo 'eval `dbus-launch --auto-syntax`' >> /boot/home/config/settings/boot/UserBootscript -fi \ No newline at end of file diff --git a/sys-apps/dbus/dbus-1.12.10.recipe b/sys-apps/dbus/dbus-1.12.6.recipe similarity index 90% rename from sys-apps/dbus/dbus-1.12.10.recipe rename to sys-apps/dbus/dbus-1.12.6.recipe index 48743c5c2..9a15eb0a7 100644 --- a/sys-apps/dbus/dbus-1.12.10.recipe +++ b/sys-apps/dbus/dbus-1.12.6.recipe @@ -11,12 +11,12 @@ going through the message bus daemon). Currently the communicating \ applications are on one computer, or through unencrypted TCP/IP suitable for \ use behind a firewall with shared NFS home directories." HOMEPAGE="https://freedesktop.org/wiki/Software/dbus/" -COPYRIGHT="2005-2018 Red Hat, Inc." +COPYRIGHT="2014 Red Hat, Inc." LICENSE="GNU GPL v2" REVISION="1" SOURCE_URI="https://dbus.freedesktop.org/releases/dbus/dbus-$portVersion.tar.gz" -CHECKSUM_SHA256="4b693d24976258c3f2fa9cc33ad9288c5fbfa7a16481dbd9a8a429f7aa8cdcf7" -ADDITIONAL_FILES="start_dbus_launch.sh" +CHECKSUM_SHA256="621b902a07badec16c9e43eda43903cd0e1e69e11b13143da71c1889b062f116" + ARCHITECTURES="!x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" @@ -24,10 +24,8 @@ GLOBAL_WRITABLE_FILES=" settings/dbus-1/session.conf keep-old settings/dbus-1/system.conf keep-old " -POST_INSTALL_SCRIPTS=" - $relativePostInstallDir/start_dbus_launch.sh - " -libVersion="3.19.8" + +libVersion="3.19.6" libVersionCompat="$libVersion compat >= ${libVersion%%.*}" PROVIDES=" @@ -113,9 +111,6 @@ INSTALL() packageEntries devel \ $developDir \ $libDir/cmake - - mkdir -p $postInstallDir - cp $portDir/additional-files/start_dbus_launch.sh $postInstallDir } TEST()