pool/dbus-1
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 660109 from Base:System

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/660109
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dbus-1?expand=0&rev=153
This commit is contained in:
Dominique Leuenberger 2018-12-28 11:32:54 +00:00 committed by Git OBS Bridge
commit 67a3814e77
4 changed files with 37 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dbus-1-x11.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Wed Dec 19 16:17:39 UTC 2018 - Jan Engelhardt <jengelh@inai.de>
- Avoid bashisms in scriptlets.
-------------------------------------------------------------------
Tue Nov 20 23:37:09 UTC 2018 - eich@suse.com
- Avoid ugly error message from %pre(install) script when installing
for the first time.
-------------------------------------------------------------------
Wed Aug 22 10:40:43 UTC 2018 - sflees@suse.de
- Update to 1.12.10

2
dbus-1-x11.spec
View File

@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#

11
dbus-1.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Wed Dec 19 16:17:39 UTC 2018 - Jan Engelhardt <jengelh@inai.de>
- Avoid bashisms in scriptlets.
-------------------------------------------------------------------
Tue Nov 20 23:37:09 UTC 2018 - eich@suse.com
- Avoid ugly error message from %pre(install) script when installing
for the first time.
-------------------------------------------------------------------
Wed Aug 22 10:40:43 UTC 2018 - sflees@suse.de
- Update to 1.12.10

26
dbus-1.spec
View File

@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
@ -229,23 +229,25 @@ getent passwd messagebus >/dev/null || \
# removed reletavly soon.
# Get the current version
CURRENT_VER=$(/usr/bin/dbus-daemon --version 2>/dev/null| sed 's/^.*[^0-9]\([0-9]*\.[0-9]*\.[0-9]*\).*$/\1/' | head -1)
if [ "$FIRST_ARG" -gt 1 ]; then
CURRENT_VER=$(/usr/bin/dbus-daemon --version 2>/dev/null| sed 's/^.*[^0-9]\([0-9]*\.[0-9]*\.[0-9]*\).*$/\1/' | head -1)
# If the current version is or less then 1.10.2 where this change was added then migration needs to be run
# The following line will return 1.10.2 if its newer then the current version
TEST_VER=$(printf "1.10.2\n$CURRENT_VER" | sort -Vr | head -1)
TEST_VER=$(printf "1.10.2\n$CURRENT_VER" | sort -Vr | head -1)
if [[ "$FIRST_ARG" -gt 1 && $TEST_VER == "1.10.12" ]]; then
if [[ -f /etc/sysconfig/services ]]; then
cp -a /etc/sysconfig/services %{_backup}
else
touch %{_backup}
fi
cat >>/etc/sysconfig/services <<EOF
if [ "$TEST_VER" = "1.10.12" ]; then
if [ -f /etc/sysconfig/services ]; then
cp -a /etc/sysconfig/services %{_backup}
else
touch %{_backup}
fi
cat >>/etc/sysconfig/services <<EOF
# temporarily added by rpm update to avoid dbus service restart
# backup saved in %{_backup}
DISABLE_RESTART_ON_UPDATE="yes"
EOF
fi
fi
%post
@ -279,9 +281,9 @@ export DISABLE_RESTART_ON_UPDATE=yes
%posttrans
# See comments in pre
if [[ -s %{_backup} ]]; then
if [ -s "%{_backup}" ]; then
mv -f %{_backup} /etc/sysconfig/services
elif [[ -e %{_backup} ]]; then
elif [ -e "%{_backup}" ]; then
rm -f /etc/sysconfig/services
fi