rpms/dbus
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Silvan Calarco 2024-01-05 21:40:22 +01:00
parent 555c665594
commit db2d5f67a5
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
dbus.spec
View File

@ -3,7 +3,7 @@
Name: dbus Name: dbus
Version: 1.13.8 Version: 1.13.8
Release: 2mamba Release: 3mamba
Summary: A message bus, used for sending messages between applications Summary: A message bus, used for sending messages between applications
Group: System/Servers Group: System/Servers
Vendor: openmamba Vendor: openmamba
@ -50,6 +50,7 @@ BuildRequires: xmlto
%endif %endif
Requires(pre): /usr/sbin/useradd Requires(pre): /usr/sbin/useradd
Requires(pre): /sbin/chkconfig Requires(pre): /sbin/chkconfig
Requires(pre): filesystem >= 2.2-19mamba
Requires: lib%{name} = %{?epoch:%epoch:}%{version}-%{release} Requires: lib%{name} = %{?epoch:%epoch:}%{version}-%{release}
Provides: dbus-tools Provides: dbus-tools
Obsoletes: dbus-tools Obsoletes: dbus-tools
@ -140,8 +141,8 @@ install -d 0755 %{buildroot}%{_datadir}/dbus-1/services
install -d %{buildroot}%{_sysconfdir}/dbus-1/system.d/ install -d %{buildroot}%{_sysconfdir}/dbus-1/system.d/
install -d %{buildroot}%{_sysconfdir}/dbus-1/session.d/ install -d %{buildroot}%{_sysconfdir}/dbus-1/session.d/
install -d %{buildroot}%{_var}/lib/dbus install -d %{buildroot}%{_var}/lib/dbus
[ -e %{buildroot}%{_var}/run/dbus ] && rmdir %{buildroot}%{_var}/run/dbus #[ -e %{buildroot}%{_var}/run/dbus ] && rmdir %{buildroot}%{_var}/run/dbus
ln -s /run/dbus %{buildroot}%{_var}/run/dbus #ln -s /run/dbus %{buildroot}%{_var}/run/dbus
#install -m 0755 %{S:1} %{buildroot}%{_initrddir}/messagebus #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
@ -151,12 +152,13 @@ ln -s /run/dbus %{buildroot}%{_var}/run/dbus
%pre %pre
if [ $1 -ge 1 ]; then if [ $1 -ge 1 ]; then
# /var/run to /run upgrade with compatibility symlink %tmpfiles_create dbus.conf
if [ -d /var/run/dbus -a ! -L /var/run/dbus -a ! -e /run/dbus ]; then ## /var/run to /run upgrade with compatibility symlink
mkdir /run/dbus #if [ -d /var/run/dbus -a ! -L /var/run/dbus -a ! -e /run/dbus ]; then
mv /var/run/dbus/* /run/dbus # mkdir /run/dbus
rmdir /var/run/dbus # mv /var/run/dbus/* /run/dbus
fi # rmdir /var/run/dbus
#fi
# add DBUS user # add DBUS user
/usr/sbin/groupadd messagebus -g %{messagebus_gid} &>/dev/null /usr/sbin/groupadd messagebus -g %{messagebus_gid} &>/dev/null
/usr/sbin/useradd -u %{messagebus_uid} -c 'DBUS user' -d /dev/null \ /usr/sbin/useradd -u %{messagebus_uid} -c 'DBUS user' -d /dev/null \
@ -229,7 +231,7 @@ find /etc/rc[0-6].d/ -type l -xtype l -exec rm -f {} \;
%{_datadir}/dbus-1/system.conf %{_datadir}/dbus-1/system.conf
%{_datadir}/xml/dbus-1/busconfig.dtd %{_datadir}/xml/dbus-1/busconfig.dtd
%{_datadir}/xml/dbus-1/introspect.dtd %{_datadir}/xml/dbus-1/introspect.dtd
%dir %{_var}/run/dbus #%dir %{_var}/run/dbus
%dir %{_var}/lib/dbus %dir %{_var}/lib/dbus
%{_mandir}/man1/dbus-cleanup-sockets.* %{_mandir}/man1/dbus-cleanup-sockets.*
%{_mandir}/man1/dbus-daemon.* %{_mandir}/man1/dbus-daemon.*
@ -266,6 +268,9 @@ find /etc/rc[0-6].d/ -type l -xtype l -exec rm -f {} \;
%{_docdir}/dbus/* %{_docdir}/dbus/*
%changelog %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 * 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 - remove profile.d/dbus-session.sh script; DBUS variables are exported by pam_systemd