Accepting request 140051 from home:elvigia:branches:Base:System
- Fix factory breakage on systemd units directory - Fix factory breakage on systemd units directory OBS-URL: https://build.opensuse.org/request/show/140051 OBS-URL: https://build.opensuse.org/package/show/Base:System/dbus-1?expand=0&rev=103
This commit is contained in:
parent
10c00e73cf
commit
2305eaeeba
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Sat Nov 3 16:33:15 UTC 2012 - crrodriguez@opensuse.org
|
||||
|
||||
- Fix factory breakage on systemd units directory
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Oct 26 06:07:21 UTC 2012 - coolo@suse.com
|
||||
|
||||
|
@ -30,6 +30,14 @@ Group: System/Daemons
|
||||
# dbus-1 and systemd. Fun!
|
||||
%define with_systemd 0
|
||||
|
||||
%if ! %{with_systemd}
|
||||
%if 0%{?suse_version} < 1230
|
||||
%define _unitdir /lib/systemd/system
|
||||
%else
|
||||
%define _unitdir /usr/lib/systemd/system
|
||||
%endif
|
||||
%endif
|
||||
|
||||
BuildRequires: audit-devel
|
||||
BuildRequires: doxygen
|
||||
BuildRequires: libexpat-devel
|
||||
@ -110,7 +118,7 @@ export V=1
|
||||
%endif
|
||||
--enable-libaudit \
|
||||
--with-console-auth-dir=/var/run/dbus/at_console/ \
|
||||
--with-systemdsystemunitdir=/lib/systemd/system
|
||||
--with-systemdsystemunitdir=%{_unitdir}
|
||||
make %{?_smp_mflags}
|
||||
doxygen -u && doxygen
|
||||
./cleanup-man-pages.sh
|
||||
|
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Sat Nov 3 16:33:15 UTC 2012 - crrodriguez@opensuse.org
|
||||
|
||||
- Fix factory breakage on systemd units directory
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Oct 26 06:07:21 UTC 2012 - coolo@suse.com
|
||||
|
||||
|
34
dbus-1.spec
34
dbus-1.spec
@ -29,6 +29,14 @@ Group: System/Daemons
|
||||
# dbus-1 and systemd. Fun!
|
||||
%define with_systemd 0
|
||||
|
||||
%if ! %{with_systemd}
|
||||
%if 0%{?suse_version} < 1230
|
||||
%define _unitdir /lib/systemd/system
|
||||
%else
|
||||
%define _unitdir /usr/lib/systemd/system
|
||||
%endif
|
||||
%endif
|
||||
|
||||
BuildRequires: audit-devel
|
||||
BuildRequires: doxygen
|
||||
BuildRequires: libexpat-devel
|
||||
@ -161,7 +169,7 @@ export V=1
|
||||
%endif
|
||||
--enable-libaudit \
|
||||
--with-console-auth-dir=/var/run/dbus/at_console/ \
|
||||
--with-systemdsystemunitdir=/lib/systemd/system
|
||||
--with-systemdsystemunitdir=%{_unitdir}
|
||||
make %{?_smp_mflags}
|
||||
doxygen -u && doxygen
|
||||
./cleanup-man-pages.sh
|
||||
@ -249,16 +257,22 @@ touch %{buildroot}/%{_localstatedir}/lib/dbus/machine-id
|
||||
%attr(4750,root,messagebus) %verify(not mode) /lib/%{name}/dbus-daemon-launch-helper
|
||||
%ghost %{_localstatedir}/run/dbus
|
||||
%ghost %{_localstatedir}/lib/dbus/machine-id
|
||||
%if ! %{with_systemd}
|
||||
%if 0%{?suse_version} < 1230
|
||||
%dir /lib/systemd
|
||||
%dir /lib/systemd/system
|
||||
/lib/systemd/system/dbus.service
|
||||
/lib/systemd/system/dbus.socket
|
||||
%dir /lib/systemd/system/dbus.target.wants
|
||||
/lib/systemd/system/dbus.target.wants/dbus.socket
|
||||
%dir /lib/systemd/system/multi-user.target.wants
|
||||
/lib/systemd/system/multi-user.target.wants/dbus.service
|
||||
%dir /lib/systemd/system/sockets.target.wants
|
||||
/lib/systemd/system/sockets.target.wants/dbus.socket
|
||||
%else
|
||||
%dir /usr/lib/systemd
|
||||
%dir %{_unitdir}
|
||||
%endif
|
||||
%endif
|
||||
%{_unitdir}/dbus.service
|
||||
%{_unitdir}/dbus.socket
|
||||
%dir %{_unitdir}/dbus.target.wants
|
||||
%{_unitdir}/dbus.target.wants/dbus.socket
|
||||
%dir %{_unitdir}/multi-user.target.wants
|
||||
%{_unitdir}/multi-user.target.wants/dbus.service
|
||||
%dir %{_unitdir}/sockets.target.wants
|
||||
%{_unitdir}/sockets.target.wants/dbus.socket
|
||||
|
||||
%files -n %{_libname}
|
||||
%defattr(-, root, root)
|
||||
|
Loading…
Reference in New Issue
Block a user