remove legacy /var/run/dbus symlink, require filesystem-2.2-19mamba for /run switch [release 1.13.8-3mamba;Sun Mar 17 2019]

configured with --enable-user-session [release 1.13.8-1mamba;Wed Feb 20 2019]

dbus.spec

@@ -2,15 +2,15 @@
 %define        messagebus_gid  25
 
 Name:          dbus
-Version:       1.12.4
-Release:       1mamba
+Version:       1.13.8
+Release:       3mamba
 Summary:       A message bus, used for sending messages between applications
 Group:         System/Servers
 Vendor:        openmamba
 Distribution:  openmamba
 Packager:      Silvan Calarco <silvan.calarco@mambasoft.it>
 URL:           http://www.freedesktop.org/Software/dbus
-Source:        http://dbus.freedesktop.org/releases/dbus/%{name}-%{version}.tar.gz
+Source:        http://dbus.freedesktop.org/releases/dbus/%{name}-%{version}.tar.xz
 Source1:       dbus-initscript
 Source2:       %{name}-session-profile.sh
 Patch0:        %{name}-1.0.1-cve_2006_6107.patch
@@ -50,6 +50,7 @@ BuildRequires: xmlto
 %endif
 Requires(pre): /usr/sbin/useradd
 Requires(pre): /sbin/chkconfig
+Requires(pre): filesystem >= 2.2-19mamba
 Requires:      lib%{name} = %{?epoch:%epoch:}%{version}-%{release}
 Provides:      dbus-tools
 Obsoletes:     dbus-tools
@@ -118,10 +119,12 @@ This package includes the %{name} API documentation.
     --enable-dnotify \
     --enable-selinux \
 	--enable-systemd \
+	--enable-user-session \
     --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,17 +140,25 @@ 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
+#install -D -m 0755 %{S:2} %{buildroot}%{_sysconfdir}/profile.d/dbus-session.sh
 
 %clean
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
 
 %pre
 if [ $1 -ge 1 ]; then
+   %tmpfiles_create dbus.conf
+   ## /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 \
@@ -193,7 +204,7 @@ find /etc/rc[0-6].d/ -type l -xtype l -exec rm -f {} \;
 %config %{_sysconfdir}/dbus-1/system.conf
 %dir %{_sysconfdir}/dbus-1/system.d/
 %dir %{_sysconfdir}/dbus-1/session.d/
-%{_sysconfdir}/profile.d/dbus-session.sh
+#%{_sysconfdir}/profile.d/dbus-session.sh
 %{_bindir}/dbus-cleanup-sockets
 %{_bindir}/dbus-daemon
 %{_bindir}/dbus-launch
@@ -211,13 +222,16 @@ find /etc/rc[0-6].d/ -type l -xtype l -exec rm -f {} \;
 #%{_unitdir}/dbus.target.wants/dbus.socket
 %{_unitdir}/multi-user.target.wants/dbus.service
 %{_unitdir}/sockets.target.wants/dbus.socket
+%{_userunitdir}/dbus.service
+%{_userunitdir}/dbus.socket
+%{_userunitdir}/sockets.target.wants/dbus.socket
 %dir %{_datadir}/dbus-1
 %dir %{_datadir}/dbus-1/services
 %{_datadir}/dbus-1/session.conf
 %{_datadir}/dbus-1/system.conf
 %{_datadir}/xml/dbus-1/busconfig.dtd
 %{_datadir}/xml/dbus-1/introspect.dtd
-%dir %{_var}/run/dbus
+#%dir %{_var}/run/dbus
 %dir %{_var}/lib/dbus
 %{_mandir}/man1/dbus-cleanup-sockets.*
 %{_mandir}/man1/dbus-daemon.*
@@ -254,6 +268,23 @@ find /etc/rc[0-6].d/ -type l -xtype l -exec rm -f {} \;
 %{_docdir}/dbus/*
 
 %changelog
+* Sun Mar 17 2019 Silvan Calarco <silvan.calarco@mambasoft.it> 1.13.8-3mamba
+- remove legacy /var/run/dbus symlink, require filesystem-2.2-19mamba for /run  switch
+
+* Tue Mar 05 2019 Silvan Calarco <silvan.calarco@mambasoft.it> 1.13.8-2mamba
+- remove profile.d/dbus-session.sh script; DBUS variables are exported by pam_systemd
+
+* Wed Feb 20 2019 Silvan Calarco <silvan.calarco@mambasoft.it> 1.13.8-1mamba
+- update to 1.13.8
+- configured with --enable-user-session
+
+* Thu Mar 29 2018 Silvan Calarco <silvan.calarco@mambasoft.it> 1.13.2-1mamba
+- update to 1.13.2
+- move /var/run to /run
+
+* Tue Mar 06 2018 Automatic Build System <autodist@mambasoft.it> 1.12.6-1mamba
+- automatic version update by autodist
+
 * Sat Feb 10 2018 Automatic Build System <autodist@mambasoft.it> 1.12.4-1mamba
 - automatic version update by autodist