pool/dbus-1
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 331538 from Base:System

Browse Source 
Add condition to account for Leap

OBS-URL: https://build.opensuse.org/request/show/331538
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dbus-1?expand=0&rev=132
This commit is contained in:
Stephan Kulow 2015-09-24 04:13:25 +00:00 committed by Git OBS Bridge
commit c7c7c8e048
5 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dbus-1-x11.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Sep 16 13:26:55 UTC 2015 - fstrba@suse.com
- Account for openSUSE:Leap in the conditional for chosing right
local state directories (boo#941352)
-------------------------------------------------------------------
Wed May 27 17:00:54 UTC 2015 - hrvoje.senjan@gmail.com

9
dbus-1-x11.spec
View File

@ -109,6 +109,7 @@ export CFLAGS="%{optflags} -fno-strict-aliasing -fPIC -fpie"
export LDFLAGS="-pie"
export CXXFLAGS="%{optflags} -fno-strict-aliasing"
export V=1
# is_opensuse was first defined after openSUSE 13.2
%configure \
--disable-static \
--with-pic \
@ -125,7 +126,7 @@ export V=1
%endif
--enable-systemd \
--enable-libaudit \
%if 0%{?suse_version} <= 1315
%if 0%{?suse_version} <= 1315 && !0%{?is_opensuse}
--with-console-auth-dir=/var/run/dbus/at_console/ \
--with-system-pid-file=/var/run/dbus/pid \
--with-system-socket=/var/run/dbus/system_bus_socket \
@ -153,7 +154,7 @@ mkdir -p %{buildroot}%{_prefix}/sbin
mv %{buildroot}/bin/dbus-launch %{buildroot}/%{_bindir}
mv %{buildroot}/bin/dbus-run-session %{buildroot}/%{_bindir}
ln -sf %{_sbindir}/service %{buildroot}/%{_sbindir}/rcdbus
%if 0%{?suse_version} <= 1315
%if 0%{?suse_version} <= 1315 && !0%{?is_opensuse}
install -d %{buildroot}/var/run/dbus
%else
install -d %{buildroot}/run/dbus
@ -189,7 +190,7 @@ ln -sf /bin/dbus-send %{buildroot}%{_bindir}/dbus-send
%pre -n dbus-1
%{_sbindir}/groupadd -r messagebus 2> /dev/null || :
%if 0%{?suse_version} <= 1315
%if 0%{?suse_version} <= 1315 && !0%{?is_opensuse}
%{_sbindir}/useradd -r -s /bin/false -c "User for D-Bus" -d /var/run/dbus -g messagebus messagebus 2> /dev/null || :
%else
%{_sbindir}/useradd -r -s /bin/false -c "User for D-Bus" -d /run/dbus -g messagebus messagebus 2> /dev/null || :
@ -244,7 +245,7 @@ fi
# See doc/system-activation.txt in source tarball for the rationale
# behind these permissions
%attr(4750,root,messagebus) %verify(not mode) /lib/dbus-1/dbus-daemon-launch-helper
%if 0%{?suse_version} <= 1315
%if 0%{?suse_version} <= 1315 && !0%{?is_opensuse}
%ghost /var/run/dbus
%else
%ghost /run/dbus

6
dbus-1-x11.spec.in
View File

@ -83,7 +83,7 @@ mkdir -p %{buildroot}%{_prefix}/sbin
mv %{buildroot}/bin/dbus-launch %{buildroot}/%{_bindir}
mv %{buildroot}/bin/dbus-run-session %{buildroot}/%{_bindir}
ln -sf %{_sbindir}/service %{buildroot}/%{_sbindir}/rcdbus
%if 0%{?suse_version} <= 1315
%if 0%{?suse_version} <= 1315 && !0%{?is_opensuse}
install -d %{buildroot}/var/run/dbus
%else
install -d %{buildroot}/run/dbus
@ -119,7 +119,7 @@ ln -sf /bin/dbus-send %{buildroot}%{_bindir}/dbus-send
%pre -n dbus-1
%{_sbindir}/groupadd -r messagebus 2> /dev/null || :
%if 0%{?suse_version} <= 1315
%if 0%{?suse_version} <= 1315 && !0%{?is_opensuse}
%{_sbindir}/useradd -r -s /bin/false -c "User for D-Bus" -d /var/run/dbus -g messagebus messagebus 2> /dev/null || :
%else
%{_sbindir}/useradd -r -s /bin/false -c "User for D-Bus" -d /run/dbus -g messagebus messagebus 2> /dev/null || :
@ -174,7 +174,7 @@ fi
# See doc/system-activation.txt in source tarball for the rationale
# behind these permissions
%attr(4750,root,messagebus) %verify(not mode) /lib/dbus-1/dbus-daemon-launch-helper
%if 0%{?suse_version} <= 1315
%if 0%{?suse_version} <= 1315 && !0%{?is_opensuse}
%ghost /var/run/dbus
%else
%ghost /run/dbus

6
dbus-1.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Sep 16 13:26:55 UTC 2015 - fstrba@suse.com
- Account for openSUSE:Leap in the conditional for chosing right
local state directories (boo#941352)
-------------------------------------------------------------------
Wed May 27 17:00:54 UTC 2015 - hrvoje.senjan@gmail.com

3
dbus-1.spec
View File

@ -99,6 +99,7 @@ export CFLAGS="%{optflags} -fno-strict-aliasing -fPIC -fpie"
export LDFLAGS="-pie"
export CXXFLAGS="%{optflags} -fno-strict-aliasing"
export V=1
# is_opensuse was first defined after openSUSE 13.2
%configure \
--disable-static \
--with-pic \
@ -115,7 +116,7 @@ export V=1
%endif
--enable-systemd \
--enable-libaudit \
%if 0%{?suse_version} <= 1315
%if 0%{?suse_version} <= 1315 && !0%{?is_opensuse}
--with-console-auth-dir=/var/run/dbus/at_console/ \
--with-system-pid-file=/var/run/dbus/pid \
--with-system-socket=/var/run/dbus/system_bus_socket \