Hello community,
here is the log from the commit of package dbus-1 for openSUSE:Factory checked in at 2018-12-28 12:32:54
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/dbus-1 (Old)
and /work/SRC/openSUSE:Factory/.dbus-1.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dbus-1"
Fri Dec 28 12:32:54 2018 rev:153 rq:660109 version:1.12.10
Changes:
--------
--- /work/SRC/openSUSE:Factory/dbus-1/dbus-1-x11.changes 2018-09-03 10:32:37.544286696 +0200
+++ /work/SRC/openSUSE:Factory/.dbus-1.new.28833/dbus-1-x11.changes 2018-12-28 12:32:55.644063522 +0100
@@ -1,0 +2,11 @@
+Wed Dec 19 16:17:39 UTC 2018 - Jan Engelhardt
+
+- 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.
+
+-------------------------------------------------------------------
dbus-1.changes: same change
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ dbus-1-x11.spec ++++++
--- /var/tmp/diff_new_pack.CQTkCP/_old 2018-12-28 12:32:56.288063075 +0100
+++ /var/tmp/diff_new_pack.CQTkCP/_new 2018-12-28 12:32:56.292063072 +0100
@@ -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/
#
++++++ dbus-1.spec ++++++
--- /var/tmp/diff_new_pack.CQTkCP/_old 2018-12-28 12:32:56.304063064 +0100
+++ /var/tmp/diff_new_pack.CQTkCP/_new 2018-12-28 12:32:56.308063061 +0100
@@ -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,14 +229,15 @@
# 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
+ if [ "$TEST_VER" = "1.10.12" ]; then
+ if [ -f /etc/sysconfig/services ]; then
cp -a /etc/sysconfig/services %{_backup}
else
touch %{_backup}
@@ -246,6 +247,7 @@
# backup saved in %{_backup}
DISABLE_RESTART_ON_UPDATE="yes"
EOF
+ fi
fi
%post
@@ -279,9 +281,9 @@
%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