Accepting request 308938 from home:sumski:branches:Base:System
- Move common-begin sections around to make pre_checkin work again - Unconditionally build with systemd features, there are no cycles now, systemd no longer buildrequires dbus-1-devel OBS-URL: https://build.opensuse.org/request/show/308938 OBS-URL: https://build.opensuse.org/package/show/Base:System/dbus-1?expand=0&rev=196
This commit is contained in:
Fridrich Strba
Git OBS Bridge
parent
66cd81f09e
commit
26ef8afe14
@ -1,3 +1,10 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed May 27 17:00:54 UTC 2015 - hrvoje.senjan@gmail.com
|
||||
|
||||
- Move common-begin sections around to make pre_checkin work again
|
||||
- Unconditionally build with systemd features, there are no cycles
|
||||
now, systemd no longer buildrequires dbus-1-devel
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon May 18 10:05:14 UTC 2015 - fstrba@suse.com
|
||||
|
||||
|
||||
@ -16,24 +16,19 @@
|
||||
#
|
||||
|
||||
|
||||
%define with_systemd 1
|
||||
%define _name dbus
|
||||
%define _libname libdbus-1-3
|
||||
%bcond_without docs
|
||||
%bcond_without selinux
|
||||
# COMMON1-BEGIN
|
||||
# COMMON1-BEGIN
|
||||
%if ! %{with_systemd}
|
||||
%define _unitdir %{_libexecdir}/systemd/system
|
||||
%endif
|
||||
Name: dbus-1-x11
|
||||
Version: 1.8.18
|
||||
Release: 0
|
||||
Summary: D-Bus Message Bus System
|
||||
License: GPL-2.0+ or AFL-2.1
|
||||
Group: System/Daemons
|
||||
Url: http://dbus.freedesktop.org/
|
||||
#
|
||||
# COMMON1-BEGIN
|
||||
# COMMON1-BEGIN
|
||||
Version: 1.8.18
|
||||
Release: 0
|
||||
Source0: http://dbus.freedesktop.org/releases/dbus/%{_name}-%{version}.tar.gz
|
||||
Source2: dbus-1.desktop
|
||||
Source3: dbus_at_console.ck
|
||||
@ -41,25 +36,23 @@ Source4: baselibs.conf
|
||||
Patch0: dbus-log-deny.patch
|
||||
# PATCH-FIX-OPENSUSE coolo@suse.de -- force a feature configure won't accept without x11 in buildrequires
|
||||
Patch1: dbus-do-autolaunch.patch
|
||||
BuildRequires: audit-devel
|
||||
BuildRequires: doxygen
|
||||
BuildRequires: libcap-ng-devel
|
||||
BuildRequires: libexpat-devel
|
||||
BuildRequires: libtool
|
||||
BuildRequires: pkg-config
|
||||
BuildRequires: update-desktop-files
|
||||
BuildRequires: xmlto
|
||||
BuildRequires: pkgconfig(x11)
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
%if %{with_systemd}
|
||||
BuildRequires: pkgconfig(libsystemd-daemon)
|
||||
BuildRequires: pkgconfig(libsystemd-login)
|
||||
%endif
|
||||
%if %{with selinux}
|
||||
BuildRequires: libselinux-devel
|
||||
%endif
|
||||
# COMMON1-END
|
||||
# COMMON1-END
|
||||
BuildRequires: audit-devel
|
||||
BuildRequires: doxygen
|
||||
BuildRequires: update-desktop-files
|
||||
BuildRequires: xmlto
|
||||
BuildRequires: pkgconfig(x11)
|
||||
|
||||
%description
|
||||
D-Bus contains some tools that require Xlib to be installed, those are
|
||||
@ -130,9 +123,7 @@ export V=1
|
||||
%if %{with selinux}
|
||||
--enable-selinux \
|
||||
%endif
|
||||
%if %{with_systemd}
|
||||
--enable-systemd \
|
||||
%endif
|
||||
--enable-libaudit \
|
||||
%if 0%{?suse_version} <= 1315
|
||||
--with-console-auth-dir=/var/run/dbus/at_console/ \
|
||||
@ -154,7 +145,7 @@ doxygen -u && doxygen
|
||||
%install
|
||||
# COMMON2-END
|
||||
# COMMON2-END
|
||||
make DESTDIR=%{buildroot} install %{?_smp_mflags}
|
||||
make DESTDIR=%{buildroot} install
|
||||
mkdir -p %{buildroot}/%{_bindir}
|
||||
mkdir -p %{buildroot}/%{_mandir}/man1
|
||||
mkdir -p %{buildroot}%{_prefix}/sbin
|
||||
@ -259,10 +250,6 @@ fi
|
||||
%ghost /run/dbus
|
||||
%endif
|
||||
%ghost %{_localstatedir}/lib/dbus/machine-id
|
||||
%if ! %{with_systemd}
|
||||
%dir %{_libexecdir}/systemd
|
||||
%dir %{_unitdir}
|
||||
%endif
|
||||
%{_unitdir}/dbus.service
|
||||
%{_unitdir}/dbus.socket
|
||||
%dir %{_unitdir}/dbus.target.wants
|
||||
|
||||
@ -16,22 +16,22 @@
|
||||
#
|
||||
|
||||
|
||||
%define with_systemd 1
|
||||
%define _name dbus
|
||||
%define _libname libdbus-1-3
|
||||
%bcond_without docs
|
||||
%bcond_without selinux
|
||||
Name: dbus-1-x11
|
||||
Summary: D-Bus Message Bus System
|
||||
License: GPL-2.0+ or AFL-2.1
|
||||
Group: System/Daemons
|
||||
Url: http://dbus.freedesktop.org/
|
||||
# COMMON1-BEGIN
|
||||
# COMMON1-END
|
||||
BuildRequires: audit-devel
|
||||
BuildRequires: doxygen
|
||||
BuildRequires: update-desktop-files
|
||||
BuildRequires: xmlto
|
||||
BuildRequires: pkgconfig(x11)
|
||||
# COMMON1-BEGIN
|
||||
# COMMON1-END
|
||||
|
||||
%description
|
||||
D-Bus contains some tools that require Xlib to be installed, those are
|
||||
@ -83,7 +83,11 @@ 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
|
||||
install -d %{buildroot}/var/run/dbus
|
||||
%else
|
||||
install -d %{buildroot}/run/dbus
|
||||
%endif
|
||||
mkdir -p %{buildroot}/%{_datadir}/susehelp/meta/Development/Libraries/
|
||||
install -m 0644 %{SOURCE2} \
|
||||
%{buildroot}/%{_datadir}/susehelp/meta/Development/Libraries/dbus-1.desktop
|
||||
@ -115,7 +119,11 @@ 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
|
||||
%{_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 || :
|
||||
%endif
|
||||
|
||||
%post -n dbus-1
|
||||
if [ -e %{_localstatedir}/lib/dbus/machine-id -a -e %{_sysconfdir}/machine-id ]; then
|
||||
@ -166,12 +174,12 @@ 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
|
||||
%ghost /var/run/dbus
|
||||
%else
|
||||
%ghost /run/dbus
|
||||
%ghost %{_localstatedir}/lib/dbus/machine-id
|
||||
%if ! %{with_systemd}
|
||||
%dir %{_libexecdir}/systemd
|
||||
%dir %{_unitdir}
|
||||
%endif
|
||||
%ghost %{_localstatedir}/lib/dbus/machine-id
|
||||
%{_unitdir}/dbus.service
|
||||
%{_unitdir}/dbus.socket
|
||||
%dir %{_unitdir}/dbus.target.wants
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed May 27 17:00:54 UTC 2015 - hrvoje.senjan@gmail.com
|
||||
|
||||
- Move common-begin sections around to make pre_checkin work again
|
||||
- Unconditionally build with systemd features, there are no cycles
|
||||
now, systemd no longer buildrequires dbus-1-devel
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon May 18 10:05:14 UTC 2015 - fstrba@suse.com
|
||||
|
||||
|
||||
17
dbus-1.spec
17
dbus-1.spec
@ -16,23 +16,20 @@
|
||||
#
|
||||
|
||||
|
||||
%define with_systemd 0
|
||||
%define with_systemd 1
|
||||
%define _name dbus
|
||||
%define _libname libdbus-1-3
|
||||
%bcond_with docs
|
||||
%bcond_without selinux
|
||||
# COMMON1-BEGIN
|
||||
%if ! %{with_systemd}
|
||||
%define _unitdir %{_libexecdir}/systemd/system
|
||||
%endif
|
||||
Name: dbus-1
|
||||
Version: 1.8.18
|
||||
Release: 0
|
||||
Summary: D-Bus Message Bus System
|
||||
License: GPL-2.0+ or AFL-2.1
|
||||
Group: System/Daemons
|
||||
Url: http://dbus.freedesktop.org/
|
||||
#
|
||||
# WARNING don't use cosmetic beautifiers. it will break the specs after calling pre_checkin script. we don't need to be pretty, but efficient
|
||||
# COMMON1-BEGIN
|
||||
Version: 1.8.18
|
||||
Release: 0
|
||||
Source0: http://dbus.freedesktop.org/releases/dbus/%{_name}-%{version}.tar.gz
|
||||
Source2: dbus-1.desktop
|
||||
Source3: dbus_at_console.ck
|
||||
@ -45,10 +42,8 @@ BuildRequires: libexpat-devel
|
||||
BuildRequires: libtool
|
||||
BuildRequires: pkg-config
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
%if %{with_systemd}
|
||||
BuildRequires: pkgconfig(libsystemd-daemon)
|
||||
BuildRequires: pkgconfig(libsystemd-login)
|
||||
%endif
|
||||
%if %{with selinux}
|
||||
BuildRequires: libselinux-devel
|
||||
%endif
|
||||
@ -118,9 +113,7 @@ export V=1
|
||||
%if %{with selinux}
|
||||
--enable-selinux \
|
||||
%endif
|
||||
%if %{with_systemd}
|
||||
--enable-systemd \
|
||||
%endif
|
||||
--enable-libaudit \
|
||||
%if 0%{?suse_version} <= 1315
|
||||
--with-console-auth-dir=/var/run/dbus/at_console/ \
|
||||
|
||||
Loading…
Reference in New Issue
Block a user