commit 33f31bc8321867905e09f327c0103d380378acd1 Author: overweight <5324761+overweight@user.noreply.gitee.com> Date: Mon Sep 30 10:36:33 2019 -0400 Package init diff --git a/bugfix-let-systemd-restart-dbus-when-the-it-enters-failed.patch b/bugfix-let-systemd-restart-dbus-when-the-it-enters-failed.patch new file mode 100644 index 0000000..ba22892 --- /dev/null +++ b/bugfix-let-systemd-restart-dbus-when-the-it-enters-failed.patch @@ -0,0 +1,26 @@ +From 223f994f79c51a32d5a6da474584447a8df4f028 Mon Sep 17 00:00:00 2001 +From: openEuler Buildteam +Date: Wed, 28 Aug 2019 19:49:53 +0800 +Subject: [PATCH] let systemd restart dbus when it enters failed + +let systemd restart dbus when it enters failed by +adding the following lines to dbus.service file +Restart=Always +RestartSec=1 +--- + bus/dbus.service.in | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/bus/dbus.service.in b/bus/dbus.service.in +index ca0b7e9..44c26c8 100644 +--- a/bus/dbus.service.in ++++ b/bus/dbus.service.in +@@ -7,3 +7,5 @@ Requires=dbus.socket + ExecStart=@EXPANDED_BINDIR@/dbus-daemon --system --address=systemd: --nofork --nopidfile --systemd-activation --syslog-only + ExecReload=@EXPANDED_BINDIR@/dbus-send --print-reply --system --type=method_call --dest=org.freedesktop.DBus / org.freedesktop.DBus.ReloadConfig + OOMScoreAdjust=-900 ++Restart=always ++RestartSec=1 +-- +2.19.1 + diff --git a/dbus-1.12.16.tar.gz b/dbus-1.12.16.tar.gz new file mode 100644 index 0000000..e44857a Binary files /dev/null and b/dbus-1.12.16.tar.gz differ diff --git a/dbus.spec b/dbus.spec new file mode 100644 index 0000000..2af51b4 --- /dev/null +++ b/dbus.spec @@ -0,0 +1,171 @@ +Name: dbus +Epoch: 1 +Version: 1.12.16 +Release: 3 +Summary: System Message Bus +License: AFLv2.1 or GPLv2+ +URL: http://www.freedesktop.org/Software/dbus/ +Source0: https://dbus.freedesktop.org/releases/dbus/%{name}-%{version}.tar.gz + +Patch9000: bugfix-let-systemd-restart-dbus-when-the-it-enters-failed.patch + +BuildRequires: systemd-devel expat-devel libselinux-devel audit-libs-devel doxygen xmlto cmake + +Requires: systemd libselinux shadow + +Obsoletes: %{name}-common %{name}-daemon %{name}-tools %{name}-libs %{name}-x11 + +Provides: %{name}-common %{name}-daemon %{name}-tools %{name}-libs %{name}-x11 + +%description +D-Bus is a message bus system, a simple way for applications to talk to one another. +In addition to interprocess communication, D-Bus helps coordinate process lifecycle; +it makes it simple and reliable to code a "single instance" application or daemon, +and to launch applications and daemons on demand when their services are needed. + +%package devel +Summary: Development files for developers +Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} xml-common + +%description devel +This package contains development files for developers. + +%package help +Summary: Man pages and other related documents for D-Bus +BuildArch: noarch +Obsoletes: %{name}-doc + +%description help +Man pages and other related documents for D-Bus. + +%prep +%autosetup -n %{name}-%{version} -p1 + +%build +%configure \ +--disable-static \ +--enable-inotify \ +--enable-libaudit \ +--enable-selinux=yes \ +--enable-systemd \ +--with-system-socket=%{_localstatedir}/run/dbus/system_bus_socket \ +--with-dbus-user=dbus \ +--libexecdir=/%{_libexecdir}/dbus-1 \ +--enable-user-session \ +--docdir=%{_pkgdocdir} \ +--enable-doxygen-docs \ +--disable-asserts + +%make_build V=1 + +%install +%make_install + +install -d $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/session.d +install -d $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d +install -d $RPM_BUILD_ROOT%{_datadir}/dbus-1/interfaces +install -d $RPM_BUILD_ROOT%{_localstatedir}/run/dbus +install -d $RPM_BUILD_ROOT%{_localstatedir}/lib/dbus + +ln -s dbus.service $RPM_BUILD_ROOT%{_unitdir}/messagebus.service + +find $RPM_BUILD_ROOT -type f -name "*.la" -delete -print +%check +make check + +%pre +# Add the "dbus" user and group +%{_sbindir}/groupadd -r dbus 2>/dev/null || : +%{_sbindir}/useradd -r -c 'D-Bus' -g dbus -s /sbin/nologin -d %{_localstatedir}/run/dbus dbus 2> /dev/null || : + + +%preun +%systemd_preun dbus.service dbus.socket +%systemd_user_preun dbus.service dbus.socket + +%post +%systemd_post dbus.service dbus.socket +%systemd_user_post dbus.service dbus.socket +/sbin/ldconfig + +%post devel -p /sbin/ldconfig + +%postun +%systemd_postun dbus.service dbus.socket +%systemd_user_postun dbus.service dbus.socket +/sbin/ldconfig + +%postun devel -p /sbin/ldconfig + +%files +%defattr(-,root,root) +%doc AUTHORS ChangeLog NEWS README +%license COPYING + +%dir %{_sysconfdir}/dbus-1 +%dir %{_sysconfdir}/dbus-1/session.d +%dir %{_sysconfdir}/dbus-1/system.d +%config %{_sysconfdir}/dbus-1/session.conf +%config %{_sysconfdir}/dbus-1/system.conf +%dir %{_datadir}/dbus-1 +%{_datadir}/dbus-1/session.conf +%{_datadir}/dbus-1/system.conf +%{_datadir}/dbus-1/services +%{_datadir}/dbus-1/system-services +%{_datadir}/dbus-1/interfaces +%{_sysusersdir}/dbus.conf + +%ghost %dir /run/%{name} +%dir %{_localstatedir}/lib/dbus/ +%{_tmpfilesdir}/dbus.conf +%{_unitdir}/dbus.service +%{_unitdir}/dbus.socket +%{_unitdir}/messagebus.service +%{_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 %{_libexecdir}/dbus-1 +%attr(4750,root,dbus) %{_libexecdir}/dbus-1/dbus-daemon-launch-helper +%{_bindir}/dbus-daemon +%{_bindir}/dbus-cleanup-sockets +%{_bindir}/dbus-run-session +%{_bindir}/dbus-test-tool +%{_bindir}/dbus-send +%{_bindir}/dbus-monitor +%{_bindir}/dbus-update-activation-environment +%{_bindir}/dbus-uuidgen +%{_bindir}/dbus-launch + +%{_libdir}/*dbus-1*.so.* + + +%files devel +%defattr(-,root,root) +%{_includedir}/* +%{_libdir}/libdbus-1.so +%dir %{_libdir}/dbus-1.0 +%{_libdir}/dbus-1.0/include +%{_datadir}/xml/dbus-1 +%{_libdir}/cmake/DBus1 +%{_libdir}/pkgconfig/dbus-1.pc + +%files help +%{_mandir}/man1/dbus-* +%{_pkgdocdir}/* +%exclude %{_pkgdocdir}/AUTHORS +%exclude %{_pkgdocdir}/ChangeLog +%exclude %{_pkgdocdir}/NEWS +%exclude %{_pkgdocdir}/README + +%changelog +* Tue Sep 24 2019 openEuler Buildteam - 1:1.12.16-3 +- Adjust requires 'shadow-utils' to 'shadow' + +* Fri Sep 20 2019 openEuler Buildteam - 1:1.12.16-2 +- Modify license 'and' to 'or' + +* Thu Aug 29 2019 openEuler Buildteam - 1:1.12.16-1 +- Package init