diff --git a/dbus.spec b/dbus.spec index 041eb99..4c5d444 100644 --- a/dbus.spec +++ b/dbus.spec @@ -2,7 +2,7 @@ %define messagebus_gid 25 Name: dbus -Version: 1.12.6 +Version: 1.13.2 Release: 1mamba Summary: A message bus, used for sending messages between applications Group: System/Servers @@ -120,8 +120,9 @@ This package includes the %{name} API documentation. --enable-systemd \ --disable-checks \ --disable-asserts \ - --with-system-pid-file=%{_var}/run/messagebus.pid \ - --with-system-socket=%{_var}/run/dbus/system_bus_socket \ + --runstatedir=/run \ + --with-system-pid-file=/run/messagebus.pid \ + --with-system-socket=/run/dbus/system_bus_socket \ --with-session-socket-dir=/tmp \ %if "%{stage1}" == "1" --without-x @@ -137,8 +138,9 @@ This package includes the %{name} API documentation. install -d 0755 %{buildroot}%{_datadir}/dbus-1/services install -d %{buildroot}%{_sysconfdir}/dbus-1/system.d/ install -d %{buildroot}%{_sysconfdir}/dbus-1/session.d/ -install -d %{buildroot}%{_var}/run/dbus install -d %{buildroot}%{_var}/lib/dbus +[ -e %{buildroot}%{_var}/run/dbus ] && rmdir %{buildroot}%{_var}/run/dbus +ln -s /run/dbus %{buildroot}%{_var}/run/dbus #install -m 0755 %{S:1} %{buildroot}%{_initrddir}/messagebus install -D -m 0755 %{S:2} %{buildroot}%{_sysconfdir}/profile.d/dbus-session.sh @@ -148,6 +150,12 @@ install -D -m 0755 %{S:2} %{buildroot}%{_sysconfdir}/profile.d/dbus-session.sh %pre if [ $1 -ge 1 ]; then + # /var/run to /run upgrade with compatibility symlink + if [ -d /var/run/dbus -a ! -L /var/run/dbus -a ! -e /run/dbus ]; then + mkdir /run/dbus + mv /var/run/dbus/* /run/dbus + rmdir /var/run/dbus + fi # add DBUS user /usr/sbin/groupadd messagebus -g %{messagebus_gid} &>/dev/null /usr/sbin/useradd -u %{messagebus_uid} -c 'DBUS user' -d /dev/null \ @@ -254,6 +262,10 @@ find /etc/rc[0-6].d/ -type l -xtype l -exec rm -f {} \; %{_docdir}/dbus/* %changelog +* Thu Mar 29 2018 Silvan Calarco 1.13.2-1mamba +- update to 1.13.2 +- move /var/run to /run + * Tue Mar 06 2018 Automatic Build System 1.12.6-1mamba - automatic version update by autodist