Accepting request 445060 from Base:System
OBS-URL: https://build.opensuse.org/request/show/445060 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dbus-1?expand=0&rev=140
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
7d190eb18d
@ -1,3 +1,40 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Dec 9 11:01:44 UTC 2016 - fstrba@suse.com
|
||||
|
||||
- Requires systemd >= 209 and drop the compatibility pkg-config
|
||||
names that don't exist in newer systemd
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Dec 8 09:33:27 UTC 2016 - jengelh@inai.de
|
||||
|
||||
- Drop useless --with-pic which is only for static libs
|
||||
- Abort installation when user/group creation fails
|
||||
- Avoid calling %service_* more than once
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Dec 6 09:53:07 UTC 2016 - fstrba@suse.com
|
||||
|
||||
- Build the dbus-1 package without X in the dbus-1.spec
|
||||
- Move the dbus-launch.nox11 to the dbus-1 package and install
|
||||
it by default
|
||||
- Build devel-doc package in dbus-1.spec and don't build any
|
||||
documentation in dbus-1-x11
|
||||
- Make dbus-1-x11 package contains only the X11-enabled dbus-launch
|
||||
- Fix some rpmlint warnings
|
||||
- Delete the dbus-1-x11.spec.in file, since maintaining it is
|
||||
more complicated then keeping in sync a dbus-1-x11.spec file of
|
||||
less then 120 lines
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Nov 21 17:54:06 CET 2016 - kukuk@suse.de
|
||||
|
||||
- Create new subpackage: dbus-1-nox11
|
||||
- contains dbus-launch without x11 support
|
||||
- Rename dbus-launch to dbus-launch.x11
|
||||
- use update-alternatives to switch between dbus-launch with and
|
||||
without X11
|
||||
- Solves [bnc#934214]
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Oct 11 07:33:15 UTC 2016 - fstrba@suse.com
|
||||
|
||||
|
||||
232
dbus-1-x11.spec
232
dbus-1-x11.spec
@ -18,17 +18,14 @@
|
||||
|
||||
%define _name dbus
|
||||
%define _libname libdbus-1-3
|
||||
%bcond_without docs
|
||||
%bcond_without selinux
|
||||
Name: dbus-1-x11
|
||||
Version: 1.10.12
|
||||
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.10.12
|
||||
Release: 0
|
||||
Source0: http://dbus.freedesktop.org/releases/dbus/%{_name}-%{version}.tar.gz
|
||||
Source2: dbus-1.desktop
|
||||
Source3: dbus_at_console.ck
|
||||
@ -39,63 +36,23 @@ Patch1: dbus-do-autolaunch.patch
|
||||
BuildRequires: libcap-ng-devel
|
||||
BuildRequires: libexpat-devel
|
||||
BuildRequires: libtool
|
||||
BuildRequires: pkg-config
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: pkgconfig(libsystemd) >= 209
|
||||
BuildRequires: pkgconfig(x11)
|
||||
Requires(post): update-alternatives
|
||||
Requires(preun): update-alternatives
|
||||
Supplements: packageand(dbus-1:libX11-6)
|
||||
Provides: dbus-launch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
BuildRequires: pkgconfig(libsystemd-daemon)
|
||||
BuildRequires: pkgconfig(libsystemd-login)
|
||||
%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
|
||||
in this separate package so server systems need not install X.
|
||||
|
||||
%package -n dbus-1-devel-doc
|
||||
Summary: Developer documentation package for D-Bus
|
||||
Group: Development/Libraries/Other
|
||||
Requires: dbus-1 = %{version}
|
||||
BuildArch: noarch
|
||||
|
||||
%description -n dbus-1-devel-doc
|
||||
D-Bus is a message bus system, a simple way for applications to talk to
|
||||
one another. D-BUS supplies both a system daemon and a
|
||||
per-user-login-session daemon. Also, the message bus is built on top of
|
||||
a general one-to-one message passing framework, which can be used by
|
||||
any two apps to communicate directly (without going through the message
|
||||
bus daemon).
|
||||
|
||||
%package -n dbus-1
|
||||
Summary: D-Bus Message Bus System
|
||||
# FIXME: use proper Requires(pre/post/preun/...)
|
||||
Group: System/Daemons
|
||||
PreReq: %{_sbindir}/groupadd
|
||||
PreReq: %{_sbindir}/useradd
|
||||
PreReq: permissions
|
||||
Requires(post): %{_libname} = %{version}
|
||||
# bug437293
|
||||
%ifarch ppc64
|
||||
Obsoletes: dbus-1-64bit
|
||||
%endif
|
||||
|
||||
%description -n dbus-1
|
||||
D-Bus is a message bus system, a simple way for applications to talk to
|
||||
one another. D-Bus supplies both a system daemon and a
|
||||
per-user-login-session daemon. Also, the message bus is built on top of
|
||||
a general one-to-one message passing framework, which can be used by
|
||||
any two apps to communicate directly (without going through the message
|
||||
bus daemon).
|
||||
|
||||
%prep
|
||||
# COMMON2-BEGIN
|
||||
# COMMON2-BEGIN
|
||||
%setup -q -n %{_name}-%{version}
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
@ -112,185 +69,50 @@ export V=1
|
||||
# is_opensuse was first defined after openSUSE 13.2
|
||||
%configure \
|
||||
--disable-static \
|
||||
--with-pic \
|
||||
--bindir=/bin \
|
||||
--libexecdir=/lib/dbus-1 \
|
||||
--libdir=/%{_lib} \
|
||||
--with-init-scripts=suse \
|
||||
--enable-inotify \
|
||||
%if %{with docs}
|
||||
--enable-doxygen-docs \
|
||||
%endif
|
||||
--disable-doxygen-docs \
|
||||
%if %{with selinux}
|
||||
--enable-selinux \
|
||||
%endif
|
||||
--enable-systemd \
|
||||
--enable-libaudit \
|
||||
%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 \
|
||||
--with-console-auth-dir=%{_localstatedir}/run/dbus/at_console/ \
|
||||
--with-system-pid-file=%{_localstatedir}/run/dbus/pid \
|
||||
--with-system-socket=%{_localstatedir}/run/dbus/system_bus_socket \
|
||||
%else
|
||||
--with-console-auth-dir=/run/dbus/at_console/ \
|
||||
--with-system-pid-file=/run/dbus/pid \
|
||||
--with-system-socket=/run/dbus/system_bus_socket \
|
||||
%endif
|
||||
--with-systemdsystemunitdir=%{_unitdir}
|
||||
--with-systemdsystemunitdir=%{_unitdir} \
|
||||
--with-x
|
||||
make %{?_smp_mflags}
|
||||
|
||||
%if %{with docs}
|
||||
doxygen -u && doxygen
|
||||
./cleanup-man-pages.sh
|
||||
%endif
|
||||
|
||||
%install
|
||||
# COMMON2-END
|
||||
# COMMON2-END
|
||||
make DESTDIR=%{buildroot} install
|
||||
tdir=$(mktemp -d)
|
||||
make DESTDIR=$tdir install
|
||||
mkdir -p %{buildroot}/%{_bindir}
|
||||
mkdir -p %{buildroot}/%{_mandir}/man1
|
||||
mkdir -p %{buildroot}%{_prefix}/sbin
|
||||
mv $tdir/bin/dbus-launch %{buildroot}/%{_bindir}/dbus-launch.x11
|
||||
mkdir -p %{buildroot}%{_sysconfdir}/alternatives
|
||||
ln -s -f %{_sysconfdir}/alternatives/dbus-launch %{buildroot}%{_bindir}/dbus-launch
|
||||
|
||||
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 && !0%{?is_opensuse}
|
||||
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
|
||||
mkdir -p %{buildroot}/%{_libdir}/pkgconfig
|
||||
mkdir -p %{buildroot}/lib/dbus-1/system-services
|
||||
mkdir -p %{buildroot}/%{_datadir}/dbus-1/system-services
|
||||
mkdir -p %{buildroot}/%{_datadir}/dbus-1/interfaces
|
||||
mkdir -p %{buildroot}/%{_libdir}/dbus-1.0/include/
|
||||
%post
|
||||
%{_sbindir}/update-alternatives --install %{_bindir}/dbus-launch dbus-launch %{_bindir}/dbus-launch.x11 20
|
||||
|
||||
chmod a-x AUTHORS COPYING HACKING NEWS README doc/*.txt doc/file-boilerplate.c doc/TODO
|
||||
|
||||
rm %{buildroot}%{_includedir}/dbus-1.0/dbus/*.h
|
||||
rm %{buildroot}/%{_lib}/libdbus-1* %{buildroot}/%{_lib}/pkgconfig/*pc
|
||||
rm %{buildroot}/%{_lib}/dbus-1.0/include/dbus/*.h
|
||||
|
||||
#
|
||||
install -d %{buildroot}%{_sysconfdir}/ConsoleKit/run-session.d
|
||||
install -m 755 %{SOURCE3} %{buildroot}%{_sysconfdir}/ConsoleKit/run-session.d
|
||||
mkdir -p %{buildroot}%{_localstatedir}/lib/dbus
|
||||
touch %{buildroot}/%{_localstatedir}/lib/dbus/machine-id
|
||||
|
||||
# Link the /bin/dbus-send binary to /usr/bin/dbus-send. This should be removed once dbus has been fully migrated to /usr
|
||||
# Currently required to make upower work together with systemd
|
||||
mkdir -p %{buildroot}%{_prefix}/bin
|
||||
ln -sf /bin/dbus-send %{buildroot}%{_bindir}/dbus-send
|
||||
|
||||
%verifyscript -n dbus-1
|
||||
%verify_permissions -e /lib/dbus-1/dbus-daemon-launch-helper
|
||||
|
||||
%pre -n dbus-1
|
||||
%{_sbindir}/groupadd -r messagebus 2> /dev/null || :
|
||||
%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 || :
|
||||
%endif
|
||||
|
||||
%post -n dbus-1
|
||||
if [ -e %{_localstatedir}/lib/dbus/machine-id -a -e %{_sysconfdir}/machine-id ]; then
|
||||
cmp -s %{_localstatedir}/lib/dbus/machine-id %{_sysconfdir}/machine-id > /dev/null
|
||||
if [ $? ]; then
|
||||
rm -f %{_localstatedir}/lib/dbus/machine-id
|
||||
fi
|
||||
%preun
|
||||
if [ "$1" = 0 ] ; then
|
||||
%{_sbindir}/update-alternatives --remove dbus-launch %{_bindir}/dbus-launch.x11
|
||||
fi
|
||||
if [ ! -e %{_localstatedir}/lib/dbus/machine-id ]; then
|
||||
if [ -e %{_sysconfdir}/machine-id ]; then
|
||||
mkdir -p %{_localstatedir}/lib/dbus/
|
||||
ln -s %{_sysconfdir}/machine-id %{_localstatedir}/lib/dbus/machine-id
|
||||
else
|
||||
/bin/dbus-uuidgen --ensure
|
||||
fi
|
||||
fi
|
||||
/sbin/ldconfig
|
||||
%set_permissions /lib/dbus-1/dbus-daemon-launch-helper
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%ghost %{_sysconfdir}/alternatives/dbus-launch
|
||||
%{_bindir}/dbus-launch
|
||||
%{_mandir}/man1/dbus-launch.1*
|
||||
|
||||
%files -n dbus-1
|
||||
%defattr(-, root, root)
|
||||
%dir %{_localstatedir}/lib/dbus
|
||||
%dir /lib/dbus-1
|
||||
%dir /lib/dbus-1/system-services
|
||||
%doc AUTHORS COPYING HACKING NEWS README
|
||||
%config(noreplace) %{_sysconfdir}/dbus-1/session.conf
|
||||
%config(noreplace) %{_sysconfdir}/dbus-1/system.conf
|
||||
%config(noreplace) %{_datadir}/dbus-1/session.conf
|
||||
%config(noreplace) %{_datadir}/dbus-1/system.conf
|
||||
%{_sysconfdir}/ConsoleKit
|
||||
/bin/dbus-cleanup-sockets
|
||||
/bin/dbus-daemon
|
||||
/bin/dbus-monitor
|
||||
%{_bindir}/dbus-run-session
|
||||
/bin/dbus-send
|
||||
%{_bindir}/dbus-send
|
||||
/bin/dbus-test-tool
|
||||
/bin/dbus-update-activation-environment
|
||||
/bin/dbus-uuidgen
|
||||
%{_mandir}/man1/dbus-cleanup-sockets.1*
|
||||
%{_mandir}/man1/dbus-daemon.1*
|
||||
%{_mandir}/man1/dbus-monitor.1*
|
||||
%{_mandir}/man1/dbus-run-session.1*
|
||||
%{_mandir}/man1/dbus-send.1*
|
||||
%{_mandir}/man1/dbus-test-tool.1*
|
||||
%{_mandir}/man1/dbus-update-activation-environment.1*
|
||||
%{_mandir}/man1/dbus-uuidgen.1*
|
||||
%{_sbindir}/rcdbus
|
||||
# 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 && !0%{?is_opensuse}
|
||||
%ghost /var/run/dbus
|
||||
%else
|
||||
%ghost /run/dbus
|
||||
%endif
|
||||
%ghost %{_localstatedir}/lib/dbus/machine-id
|
||||
%{_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 dbus-1-devel-doc
|
||||
%defattr(-,root,root)
|
||||
%dir %{_datadir}/doc/dbus
|
||||
%dir %{_datadir}/doc/dbus/examples
|
||||
%{_datadir}/doc/dbus/api/
|
||||
%doc %{_datadir}/doc/dbus/dbus-faq.html
|
||||
%doc %{_datadir}/doc/dbus/dbus-specification.html
|
||||
%doc %{_datadir}/doc/dbus/dbus-test-plan.html
|
||||
%doc %{_datadir}/doc/dbus/dbus-tutorial.html
|
||||
%doc %{_datadir}/doc/dbus/diagram.*
|
||||
%doc %{_datadir}/doc/dbus/system-activation.txt
|
||||
%doc %{_datadir}/doc/dbus/dbus-cleanup-sockets.1.html
|
||||
%doc %{_datadir}/doc/dbus/dbus-daemon.1.html
|
||||
%doc %{_datadir}/doc/dbus/dbus-launch.1.html
|
||||
%doc %{_datadir}/doc/dbus/dbus-run-session.1.html
|
||||
%doc %{_datadir}/doc/dbus/dbus-monitor.1.html
|
||||
%doc %{_datadir}/doc/dbus/dbus-send.1.html
|
||||
%doc %{_datadir}/doc/dbus/dbus-uuidgen.1.html
|
||||
%doc %{_datadir}/doc/dbus/dbus.devhelp
|
||||
%doc %{_datadir}/doc/dbus/dbus-test-tool.1.html
|
||||
%doc %{_datadir}/doc/dbus/dbus-update-activation-environment.1.html
|
||||
%doc %{_datadir}/doc/dbus/examples/GetAllMatchRules.py
|
||||
%doc %{_datadir}/doc/dbus/examples/example-session-disable-stats.conf
|
||||
%doc %{_datadir}/doc/dbus/examples/example-system-enable-stats.conf
|
||||
%doc doc/*.txt doc/file-boilerplate.c doc/TODO
|
||||
%{_datadir}/susehelp
|
||||
%{_bindir}/dbus-launch.x11
|
||||
|
||||
%changelog
|
||||
|
||||
@ -1,222 +0,0 @@
|
||||
#
|
||||
# spec file for package dbus-1-x11.spec
|
||||
#
|
||||
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
# upon. The license for this file, and modifications and additions to the
|
||||
# file, is the same license as for the pristine package itself (unless the
|
||||
# license for the pristine package is not an Open Source License, in which
|
||||
# case the license is the MIT License). An "Open Source License" is a
|
||||
# license that conforms to the Open Source Definition (Version 1.9)
|
||||
# published by the Open Source Initiative.
|
||||
|
||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
|
||||
%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: pkgconfig
|
||||
BuildRequires: update-desktop-files
|
||||
BuildRequires: xmlto
|
||||
BuildRequires: pkgconfig(x11)
|
||||
|
||||
%description
|
||||
D-Bus contains some tools that require Xlib to be installed, those are
|
||||
in this separate package so server systems need not install X.
|
||||
|
||||
%package -n dbus-1-devel-doc
|
||||
Summary: Developer documentation package for D-Bus
|
||||
Group: Development/Libraries/Other
|
||||
Requires: dbus-1 = %{version}
|
||||
BuildArch: noarch
|
||||
|
||||
%description -n dbus-1-devel-doc
|
||||
D-Bus is a message bus system, a simple way for applications to talk to
|
||||
one another. D-BUS supplies both a system daemon and a
|
||||
per-user-login-session daemon. Also, the message bus is built on top of
|
||||
a general one-to-one message passing framework, which can be used by
|
||||
any two apps to communicate directly (without going through the message
|
||||
bus daemon).
|
||||
|
||||
%package -n dbus-1
|
||||
Summary: D-Bus Message Bus System
|
||||
Group: System/Daemons
|
||||
# FIXME: use proper Requires(pre/post/preun/...)
|
||||
PreReq: %{_sbindir}/groupadd
|
||||
PreReq: %{_sbindir}/useradd
|
||||
PreReq: permissions
|
||||
Requires(post): %{_libname} = %{version}
|
||||
|
||||
%description -n dbus-1
|
||||
D-Bus is a message bus system, a simple way for applications to talk to
|
||||
one another. D-Bus supplies both a system daemon and a
|
||||
per-user-login-session daemon. Also, the message bus is built on top of
|
||||
a general one-to-one message passing framework, which can be used by
|
||||
any two apps to communicate directly (without going through the message
|
||||
bus daemon).
|
||||
|
||||
%prep
|
||||
# COMMON2-BEGIN
|
||||
# COMMON2-END
|
||||
make DESTDIR=%{buildroot} install
|
||||
mkdir -p %{buildroot}/%{_bindir}
|
||||
mkdir -p %{buildroot}/%{_mandir}/man1
|
||||
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 && !0%{?is_opensuse}
|
||||
install -d %{buildroot}%{_localstatedir}/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
|
||||
mkdir -p %{buildroot}/%{_libdir}/pkgconfig
|
||||
mkdir -p %{buildroot}/lib/dbus-1/system-services
|
||||
mkdir -p %{buildroot}/%{_datadir}/dbus-1/system-services
|
||||
mkdir -p %{buildroot}/%{_datadir}/dbus-1/interfaces
|
||||
mkdir -p %{buildroot}/%{_libdir}/dbus-1.0/include/
|
||||
|
||||
chmod a-x AUTHORS COPYING HACKING NEWS README doc/*.txt doc/file-boilerplate.c doc/TODO
|
||||
|
||||
rm %{buildroot}%{_includedir}/dbus-1.0/dbus/*.h
|
||||
rm %{buildroot}/%{_lib}/libdbus-1* %{buildroot}/%{_lib}/pkgconfig/*pc
|
||||
rm %{buildroot}/%{_lib}/dbus-1.0/include/dbus/*.h
|
||||
|
||||
#
|
||||
install -d %{buildroot}%{_sysconfdir}/ConsoleKit/run-session.d
|
||||
install -m 755 %{SOURCE3} %{buildroot}%{_sysconfdir}/ConsoleKit/run-session.d
|
||||
mkdir -p %{buildroot}%{_localstatedir}/lib/dbus
|
||||
touch %{buildroot}/%{_localstatedir}/lib/dbus/machine-id
|
||||
|
||||
# Link the /bin/dbus-send binary to /usr/bin/dbus-send. This should be removed once dbus has been fully migrated to /usr
|
||||
# Currently required to make upower work together with systemd
|
||||
mkdir -p %{buildroot}%{_prefix}/bin
|
||||
ln -sf /bin/dbus-send %{buildroot}%{_bindir}/dbus-send
|
||||
|
||||
%verifyscript -n dbus-1
|
||||
%verify_permissions -e /lib/dbus-1/dbus-daemon-launch-helper
|
||||
|
||||
%pre -n dbus-1
|
||||
%{_sbindir}/groupadd -r messagebus 2> /dev/null || :
|
||||
%if 0%{?suse_version} <= 1315 && !0%{?is_opensuse}
|
||||
%{_sbindir}/useradd -r -s /bin/false -c "User for D-Bus" -d %{_localstatedir}/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
|
||||
cmp -s %{_localstatedir}/lib/dbus/machine-id %{_sysconfdir}/machine-id > /dev/null
|
||||
if [ $? ]; then
|
||||
rm -f %{_localstatedir}/lib/dbus/machine-id
|
||||
fi
|
||||
fi
|
||||
if [ ! -e %{_localstatedir}/lib/dbus/machine-id ]; then
|
||||
if [ -e %{_sysconfdir}/machine-id ]; then
|
||||
mkdir -p %{_localstatedir}/lib/dbus/
|
||||
ln -s %{_sysconfdir}/machine-id %{_localstatedir}/lib/dbus/machine-id
|
||||
else
|
||||
/bin/dbus-uuidgen --ensure
|
||||
fi
|
||||
fi
|
||||
/sbin/ldconfig
|
||||
%set_permissions /lib/dbus-1/dbus-daemon-launch-helper
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%{_bindir}/dbus-launch
|
||||
%{_mandir}/man1/dbus-launch.1*
|
||||
|
||||
%files -n dbus-1
|
||||
%defattr(-, root, root)
|
||||
%dir %{_localstatedir}/lib/dbus
|
||||
%dir /lib/dbus-1
|
||||
%dir /lib/dbus-1/system-services
|
||||
%doc AUTHORS COPYING HACKING NEWS README
|
||||
%config(noreplace) %{_sysconfdir}/dbus-1/session.conf
|
||||
%config(noreplace) %{_sysconfdir}/dbus-1/system.conf
|
||||
%config(noreplace) %{_datadir}/dbus-1/session.conf
|
||||
%config(noreplace) %{_datadir}/dbus-1/system.conf
|
||||
%{_sysconfdir}/ConsoleKit
|
||||
/bin/dbus-cleanup-sockets
|
||||
/bin/dbus-daemon
|
||||
/bin/dbus-monitor
|
||||
%{_bindir}/dbus-run-session
|
||||
/bin/dbus-send
|
||||
%{_bindir}/dbus-send
|
||||
/bin/dbus-test-tool
|
||||
/bin/dbus-update-activation-environment
|
||||
/bin/dbus-uuidgen
|
||||
%{_mandir}/man1/dbus-cleanup-sockets.1*
|
||||
%{_mandir}/man1/dbus-daemon.1*
|
||||
%{_mandir}/man1/dbus-monitor.1*
|
||||
%{_mandir}/man1/dbus-run-session.1*
|
||||
%{_mandir}/man1/dbus-send.1*
|
||||
%{_mandir}/man1/dbus-test-tool.1*
|
||||
%{_mandir}/man1/dbus-update-activation-environment.1*
|
||||
%{_mandir}/man1/dbus-uuidgen.1*
|
||||
%{_sbindir}/rcdbus
|
||||
# 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 && !0%{?is_opensuse}
|
||||
%ghost %{_localstatedir}/run/dbus
|
||||
%else
|
||||
%ghost /run/dbus
|
||||
%endif
|
||||
%ghost %{_localstatedir}/lib/dbus/machine-id
|
||||
%{_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 dbus-1-devel-doc
|
||||
%defattr(-,root,root)
|
||||
%dir %{_datadir}/doc/dbus
|
||||
%dir %{_datadir}/doc/dbus/examples
|
||||
%{_datadir}/doc/dbus/api/
|
||||
%doc %{_datadir}/doc/dbus/dbus-faq.html
|
||||
%doc %{_datadir}/doc/dbus/dbus-specification.html
|
||||
%doc %{_datadir}/doc/dbus/dbus-test-plan.html
|
||||
%doc %{_datadir}/doc/dbus/dbus-tutorial.html
|
||||
%doc %{_datadir}/doc/dbus/diagram.*
|
||||
%doc %{_datadir}/doc/dbus/system-activation.txt
|
||||
%doc %{_datadir}/doc/dbus/dbus-cleanup-sockets.1.html
|
||||
%doc %{_datadir}/doc/dbus/dbus-daemon.1.html
|
||||
%doc %{_datadir}/doc/dbus/dbus-launch.1.html
|
||||
%doc %{_datadir}/doc/dbus/dbus-run-session.1.html
|
||||
%doc %{_datadir}/doc/dbus/dbus-monitor.1.html
|
||||
%doc %{_datadir}/doc/dbus/dbus-send.1.html
|
||||
%doc %{_datadir}/doc/dbus/dbus-uuidgen.1.html
|
||||
%doc %{_datadir}/doc/dbus/dbus.devhelp
|
||||
%doc %{_datadir}/doc/dbus/dbus-test-tool.1.html
|
||||
%doc %{_datadir}/doc/dbus/dbus-update-activation-environment.1.html
|
||||
%doc %{_datadir}/doc/dbus/examples/GetAllMatchRules.py
|
||||
%doc %{_datadir}/doc/dbus/examples/example-session-disable-stats.conf
|
||||
%doc %{_datadir}/doc/dbus/examples/example-system-enable-stats.conf
|
||||
%doc doc/*.txt doc/file-boilerplate.c doc/TODO
|
||||
%{_datadir}/susehelp
|
||||
|
||||
%changelog
|
||||
@ -1,3 +1,40 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Dec 9 11:01:44 UTC 2016 - fstrba@suse.com
|
||||
|
||||
- Requires systemd >= 209 and drop the compatibility pkg-config
|
||||
names that don't exist in newer systemd
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Dec 8 09:33:27 UTC 2016 - jengelh@inai.de
|
||||
|
||||
- Drop useless --with-pic which is only for static libs
|
||||
- Abort installation when user/group creation fails
|
||||
- Avoid calling %service_* more than once
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Dec 6 09:53:07 UTC 2016 - fstrba@suse.com
|
||||
|
||||
- Build the dbus-1 package without X in the dbus-1.spec
|
||||
- Move the dbus-launch.nox11 to the dbus-1 package and install
|
||||
it by default
|
||||
- Build devel-doc package in dbus-1.spec and don't build any
|
||||
documentation in dbus-1-x11
|
||||
- Make dbus-1-x11 package contains only the X11-enabled dbus-launch
|
||||
- Fix some rpmlint warnings
|
||||
- Delete the dbus-1-x11.spec.in file, since maintaining it is
|
||||
more complicated then keeping in sync a dbus-1-x11.spec file of
|
||||
less then 120 lines
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Nov 21 17:54:06 CET 2016 - kukuk@suse.de
|
||||
|
||||
- Create new subpackage: dbus-1-nox11
|
||||
- contains dbus-launch without x11 support
|
||||
- Rename dbus-launch to dbus-launch.x11
|
||||
- use update-alternatives to switch between dbus-launch with and
|
||||
without X11
|
||||
- Solves [bnc#934214]
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Oct 11 07:33:15 UTC 2016 - fstrba@suse.com
|
||||
|
||||
|
||||
246
dbus-1.spec
246
dbus-1.spec
@ -19,17 +19,14 @@
|
||||
%define with_systemd 1
|
||||
%define _name dbus
|
||||
%define _libname libdbus-1-3
|
||||
%bcond_with docs
|
||||
%bcond_without selinux
|
||||
Name: dbus-1
|
||||
Version: 1.10.12
|
||||
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.10.12
|
||||
Release: 0
|
||||
Source0: http://dbus.freedesktop.org/releases/dbus/%{_name}-%{version}.tar.gz
|
||||
Source2: dbus-1.desktop
|
||||
Source3: dbus_at_console.ck
|
||||
@ -37,29 +34,44 @@ 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: permissions
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: update-desktop-files
|
||||
BuildRequires: xmlto
|
||||
BuildRequires: pkgconfig(libsystemd) >= 209
|
||||
Requires(post): %{_libname} = %{version}
|
||||
Requires(post): update-alternatives
|
||||
Requires(pre): permissions
|
||||
Requires(pre): shadow
|
||||
Requires(preun): update-alternatives
|
||||
Provides: dbus-launch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
BuildRequires: pkgconfig(libsystemd-daemon)
|
||||
BuildRequires: pkgconfig(libsystemd-login)
|
||||
%if %{with selinux}
|
||||
BuildRequires: libselinux-devel
|
||||
%endif
|
||||
# COMMON1-END
|
||||
|
||||
%package -n %{_libname}
|
||||
Summary: Library package for D-Bus
|
||||
Group: Development/Libraries/Other
|
||||
|
||||
%package -n dbus-1-devel
|
||||
%package devel
|
||||
Summary: Developer package for D-Bus
|
||||
Group: Development/Libraries/Other
|
||||
Requires: %{_libname} = %{version}
|
||||
Requires: dbus-1
|
||||
Requires: dbus-1 = %{version}
|
||||
Requires: glibc-devel
|
||||
|
||||
%package devel-doc
|
||||
Summary: Developer documentation package for D-Bus
|
||||
Group: Development/Libraries/Other
|
||||
Requires: dbus-1 = %{version}
|
||||
BuildArch: noarch
|
||||
|
||||
%description
|
||||
D-Bus is a message bus system, a simple way for applications to talk to
|
||||
one another. D-Bus supplies both a system daemon and a
|
||||
@ -76,7 +88,7 @@ a general one-to-one message passing framework, which can be used by
|
||||
any two apps to communicate directly (without going through the message
|
||||
bus daemon).
|
||||
|
||||
%description -n dbus-1-devel
|
||||
%description devel
|
||||
D-Bus is a message bus system, a simple way for applications to talk to
|
||||
one another. D-Bus supplies both a system daemon and a
|
||||
per-user-login-session daemon. Also, the message bus is built on top of
|
||||
@ -84,8 +96,15 @@ a general one-to-one message passing framework, which can be used by
|
||||
any two apps to communicate directly (without going through the message
|
||||
bus daemon).
|
||||
|
||||
%description devel-doc
|
||||
D-Bus is a message bus system, a simple way for applications to talk to
|
||||
one another. D-BUS supplies both a system daemon and a
|
||||
per-user-login-session daemon. Also, the message bus is built on top of
|
||||
a general one-to-one message passing framework, which can be used by
|
||||
any two apps to communicate directly (without going through the message
|
||||
bus daemon).
|
||||
|
||||
%prep
|
||||
# COMMON2-BEGIN
|
||||
%setup -q -n %{_name}-%{version}
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
@ -102,74 +121,184 @@ export V=1
|
||||
# is_opensuse was first defined after openSUSE 13.2
|
||||
%configure \
|
||||
--disable-static \
|
||||
--with-pic \
|
||||
--bindir=/bin \
|
||||
--libexecdir=/lib/dbus-1 \
|
||||
--libdir=/%{_lib} \
|
||||
--with-init-scripts=suse \
|
||||
--enable-inotify \
|
||||
%if %{with docs}
|
||||
--enable-doxygen-docs \
|
||||
%endif
|
||||
%if %{with selinux}
|
||||
--enable-selinux \
|
||||
%endif
|
||||
--enable-systemd \
|
||||
--enable-libaudit \
|
||||
%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 \
|
||||
--with-console-auth-dir=%{_localstatedir}/run/dbus/at_console/ \
|
||||
--with-system-pid-file=%{_localstatedir}/run/dbus/pid \
|
||||
--with-system-socket=%{_localstatedir}/run/dbus/system_bus_socket \
|
||||
%else
|
||||
--with-console-auth-dir=/run/dbus/at_console/ \
|
||||
--with-system-pid-file=/run/dbus/pid \
|
||||
--with-system-socket=/run/dbus/system_bus_socket \
|
||||
%endif
|
||||
--with-systemdsystemunitdir=%{_unitdir}
|
||||
--with-systemdsystemunitdir=%{_unitdir} \
|
||||
--without-x
|
||||
make %{?_smp_mflags}
|
||||
|
||||
%if %{with docs}
|
||||
doxygen -u && doxygen
|
||||
./cleanup-man-pages.sh
|
||||
%endif
|
||||
|
||||
%install
|
||||
# COMMON2-END
|
||||
tdir=$(mktemp -d)
|
||||
make DESTDIR=$tdir install
|
||||
make %{?_smp_mflags} DESTDIR=%{buildroot} install
|
||||
|
||||
# devel stuff must not be in /lib
|
||||
mkdir -p %{buildroot}%{_libdir}
|
||||
ln -s -v /%{_lib}/$(readlink $tdir/%{_lib}/lib%{name}.so) %{buildroot}%{_libdir}/lib%{name}.so
|
||||
rm -v $tdir/%{_lib}/lib%{name}.so
|
||||
mkdir -p %{buildroot}/%{_libdir}/dbus-1.0/include/
|
||||
mv -f $tdir/%{_lib}/dbus-1.0/include/* %{buildroot}/%{_libdir}/dbus-1.0/include/
|
||||
rm -f $tdir/%{_lib}/*.la
|
||||
mv -f %{buildroot}/%{_lib}/dbus-1.0/include/* %{buildroot}/%{_libdir}/dbus-1.0/include/
|
||||
find %{buildroot} -type f -name "*.la" -delete -print
|
||||
ln -s -v /%{_lib}/$(readlink %{buildroot}/%{_lib}/lib%{name}.so) %{buildroot}%{_libdir}/lib%{name}.so
|
||||
rm -v %{buildroot}/%{_lib}/lib%{name}.so
|
||||
|
||||
mkdir -p %{buildroot}%{_libdir}/dbus-1.0/include/
|
||||
mkdir -p %{buildroot}/lib/dbus-1/system-services
|
||||
# dbus-launch, too
|
||||
mkdir -p %{buildroot}/%{_bindir}
|
||||
mv %{buildroot}/bin/dbus-run-session %{buildroot}/%{_bindir}
|
||||
mv -f %{buildroot}/bin/dbus-launch %{buildroot}%{_bindir}/dbus-launch.nox11
|
||||
mkdir -p %{buildroot}%{_sbindir}
|
||||
ln -sf %{_sbindir}/service %{buildroot}/%{_sbindir}/rcdbus
|
||||
%if 0%{?suse_version} <= 1315 && !0%{?is_opensuse}
|
||||
install -d %{buildroot}%{_localstatedir}/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
|
||||
mkdir -p %{buildroot}/%{_libdir}/pkgconfig
|
||||
mkdir -p %{buildroot}/lib/dbus-1/system-services
|
||||
mkdir -p %{buildroot}/%{_datadir}/dbus-1/interfaces
|
||||
|
||||
# fix up pkgconfig file
|
||||
mkdir -p %{buildroot}/%{_libdir}/pkgconfig
|
||||
sed -e 's@^\(libdir=\).*@\1%{_libdir}@' $tdir/%{_lib}/pkgconfig/dbus-1.pc > %{buildroot}/%{_libdir}/pkgconfig/dbus-1.pc
|
||||
rm -f $tdir/%{_lib}/pkgconfig/dbus-1.pc
|
||||
|
||||
pushd $tdir
|
||||
filelist=$(mktemp)
|
||||
find .%{_includedir} -type f > $filelist
|
||||
find ./%{_lib} -name "*.so*" >> $filelist
|
||||
cat $filelist | while read file; do
|
||||
mkdir -p $(dirname %{buildroot}/$file)
|
||||
cp -a $file %{buildroot}/$file
|
||||
done
|
||||
popd
|
||||
rm -rf $tdir
|
||||
sed -e 's@^\(libdir=\).*@\1%{_libdir}@' %{buildroot}/%{_lib}/pkgconfig/dbus-1.pc > %{buildroot}/%{_libdir}/pkgconfig/dbus-1.pc
|
||||
rm -f %{buildroot}/%{_lib}/pkgconfig/dbus-1.pc
|
||||
|
||||
for i in %{_sysconfdir}/dbus-1/session.d %{_sysconfdir}/dbus-1/system.d \
|
||||
%{_datadir}/dbus-1/interfaces %{_datadir}/dbus-1/services %{_datadir}/dbus-1/system-services; do
|
||||
mkdir -p %{buildroot}$i
|
||||
done
|
||||
|
||||
%post -n %{_libname} -p /sbin/ldconfig
|
||||
install -d %{buildroot}%{_sysconfdir}/ConsoleKit/run-session.d
|
||||
install -m 755 %{SOURCE3} %{buildroot}%{_sysconfdir}/ConsoleKit/run-session.d
|
||||
mkdir -p %{buildroot}%{_localstatedir}/lib/dbus
|
||||
touch %{buildroot}/%{_localstatedir}/lib/dbus/machine-id
|
||||
|
||||
# Link the /bin/dbus-send binary to /usr/bin/dbus-send. This should be removed once dbus has been fully migrated to /usr
|
||||
# Currently required to make upower work together with systemd
|
||||
mkdir -p %{buildroot}%{_prefix}/bin
|
||||
ln -sf /bin/dbus-send %{buildroot}%{_bindir}/dbus-send
|
||||
|
||||
mkdir -p %{buildroot}%{_sysconfdir}/alternatives
|
||||
ln -s -f %{_sysconfdir}/alternatives/dbus-launch %{buildroot}%{_bindir}/dbus-launch
|
||||
|
||||
find %{buildroot} -type f -name "*.la" -delete -print
|
||||
|
||||
%verifyscript -n dbus-1
|
||||
%verify_permissions -e /lib/dbus-1/dbus-daemon-launch-helper
|
||||
|
||||
%post -n %{_libname} -p /sbin/ldconfig
|
||||
%postun -n %{_libname} -p /sbin/ldconfig
|
||||
%pre
|
||||
getent group messagebus >/dev/null 2>/dev/null || \
|
||||
%{_sbindir}/groupadd -r messagebus
|
||||
%if 0%{?suse_version} <= 1315 && !0%{?is_opensuse}
|
||||
getent passwd messagebus >/dev/null 2>/dev/null || \
|
||||
%{_sbindir}/useradd -r -s /bin/false -c "User for D-Bus" -d %{_localstatedir}/run/dbus -g messagebus messagebus
|
||||
%else
|
||||
getent passwd messagebus >/dev/null 2>/dev/null || \
|
||||
%{_sbindir}/useradd -r -s /bin/false -c "User for D-Bus" -d /run/dbus -g messagebus messagebus
|
||||
%endif
|
||||
%service_add_pre dbus.service dbus.socket
|
||||
|
||||
%post
|
||||
if [ -e %{_localstatedir}/lib/dbus/machine-id -a -e %{_sysconfdir}/machine-id ]; then
|
||||
cmp -s %{_localstatedir}/lib/dbus/machine-id %{_sysconfdir}/machine-id > /dev/null
|
||||
if [ $? ]; then
|
||||
rm -f %{_localstatedir}/lib/dbus/machine-id
|
||||
fi
|
||||
fi
|
||||
if [ ! -e %{_localstatedir}/lib/dbus/machine-id ]; then
|
||||
if [ -e %{_sysconfdir}/machine-id ]; then
|
||||
mkdir -p %{_localstatedir}/lib/dbus/
|
||||
ln -s %{_sysconfdir}/machine-id %{_localstatedir}/lib/dbus/machine-id
|
||||
else
|
||||
/bin/dbus-uuidgen --ensure
|
||||
fi
|
||||
fi
|
||||
/sbin/ldconfig
|
||||
%set_permissions /lib/dbus-1/dbus-daemon-launch-helper
|
||||
%{_sbindir}/update-alternatives --install %{_bindir}/dbus-launch dbus-launch %{_bindir}/dbus-launch.nox11 10
|
||||
%service_add_post dbus.service dbus.socket
|
||||
|
||||
%preun
|
||||
if [ "$1" = 0 ] ; then
|
||||
%{_sbindir}/update-alternatives --remove dbus-launch %{_bindir}/dbus-launch.nox11
|
||||
fi
|
||||
%service_del_preun dbus.service dbus.socket
|
||||
|
||||
%postun
|
||||
%service_del_postun dbus.service dbus.socket
|
||||
|
||||
%files
|
||||
%defattr(-, root, root)
|
||||
%dir %{_localstatedir}/lib/dbus
|
||||
%dir /lib/dbus-1
|
||||
%dir /lib/dbus-1/system-services
|
||||
%doc AUTHORS COPYING HACKING NEWS README
|
||||
%config(noreplace) %{_sysconfdir}/dbus-1/session.conf
|
||||
%config(noreplace) %{_sysconfdir}/dbus-1/system.conf
|
||||
%{_datadir}/dbus-1/session.conf
|
||||
%{_datadir}/dbus-1/system.conf
|
||||
%{_sysconfdir}/ConsoleKit
|
||||
/bin/dbus-cleanup-sockets
|
||||
/bin/dbus-daemon
|
||||
/bin/dbus-monitor
|
||||
%{_bindir}/dbus-run-session
|
||||
/bin/dbus-send
|
||||
%{_bindir}/dbus-send
|
||||
/bin/dbus-test-tool
|
||||
/bin/dbus-update-activation-environment
|
||||
/bin/dbus-uuidgen
|
||||
%{_mandir}/man1/dbus-cleanup-sockets.1*
|
||||
%{_mandir}/man1/dbus-daemon.1*
|
||||
%{_mandir}/man1/dbus-monitor.1*
|
||||
%{_mandir}/man1/dbus-run-session.1*
|
||||
%{_mandir}/man1/dbus-send.1*
|
||||
%{_mandir}/man1/dbus-test-tool.1*
|
||||
%{_mandir}/man1/dbus-update-activation-environment.1*
|
||||
%{_mandir}/man1/dbus-uuidgen.1*
|
||||
%{_mandir}/man1/dbus-launch.1*
|
||||
%{_sbindir}/rcdbus
|
||||
# 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 && !0%{?is_opensuse}
|
||||
%ghost %{_localstatedir}/run/dbus
|
||||
%else
|
||||
%ghost /run/dbus
|
||||
%endif
|
||||
%ghost %{_localstatedir}/lib/dbus/machine-id
|
||||
%{_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
|
||||
%ghost %{_sysconfdir}/alternatives/dbus-launch
|
||||
%{_bindir}/dbus-launch.nox11
|
||||
%{_bindir}/dbus-launch
|
||||
|
||||
%files -n %{_libname}
|
||||
%defattr(-, root, root)
|
||||
@ -184,7 +313,7 @@ done
|
||||
%dir %{_datadir}/dbus-1/services
|
||||
%dir %{_datadir}/dbus-1/system-services
|
||||
|
||||
%files -n dbus-1-devel
|
||||
%files devel
|
||||
%defattr(-,root,root)
|
||||
%{_includedir}/*
|
||||
%{_libdir}/libdbus-1.so
|
||||
@ -192,4 +321,31 @@ done
|
||||
%{_libdir}/dbus-1.0/include
|
||||
%{_libdir}/pkgconfig/dbus-1.pc
|
||||
|
||||
%files devel-doc
|
||||
%defattr(-,root,root)
|
||||
%dir %{_datadir}/doc/dbus
|
||||
%dir %{_datadir}/doc/dbus/examples
|
||||
%{_datadir}/doc/dbus/api/
|
||||
%doc %{_datadir}/doc/dbus/dbus-faq.html
|
||||
%doc %{_datadir}/doc/dbus/dbus-specification.html
|
||||
%doc %{_datadir}/doc/dbus/dbus-test-plan.html
|
||||
%doc %{_datadir}/doc/dbus/dbus-tutorial.html
|
||||
%doc %{_datadir}/doc/dbus/diagram.*
|
||||
%doc %{_datadir}/doc/dbus/system-activation.txt
|
||||
%doc %{_datadir}/doc/dbus/dbus-cleanup-sockets.1.html
|
||||
%doc %{_datadir}/doc/dbus/dbus-daemon.1.html
|
||||
%doc %{_datadir}/doc/dbus/dbus-launch.1.html
|
||||
%doc %{_datadir}/doc/dbus/dbus-run-session.1.html
|
||||
%doc %{_datadir}/doc/dbus/dbus-monitor.1.html
|
||||
%doc %{_datadir}/doc/dbus/dbus-send.1.html
|
||||
%doc %{_datadir}/doc/dbus/dbus-uuidgen.1.html
|
||||
%doc %{_datadir}/doc/dbus/dbus.devhelp
|
||||
%doc %{_datadir}/doc/dbus/dbus-test-tool.1.html
|
||||
%doc %{_datadir}/doc/dbus/dbus-update-activation-environment.1.html
|
||||
%doc %{_datadir}/doc/dbus/examples/GetAllMatchRules.py
|
||||
%doc %{_datadir}/doc/dbus/examples/example-session-disable-stats.conf
|
||||
%doc %{_datadir}/doc/dbus/examples/example-system-enable-stats.conf
|
||||
%doc doc/*.txt doc/file-boilerplate.c doc/TODO
|
||||
%{_datadir}/susehelp
|
||||
|
||||
%changelog
|
||||
|
||||
@ -4,19 +4,4 @@
|
||||
|
||||
cp -lf dbus-1.changes dbus-1-x11.changes
|
||||
|
||||
for spec in dbus-1-x11.spec; do
|
||||
cp -f $spec.in $spec
|
||||
for n in $(seq 1 10); do
|
||||
grep -q "COMMON$n-BEGIN" dbus-1.spec || continue
|
||||
{ sed -n -e "1,/COMMON$n-BEGIN/p" $spec
|
||||
sed -n -e "/COMMON$n-BEGIN/,/COMMON$n-END/p" dbus-1.spec
|
||||
sed -n -e "/COMMON$n-END/,\$p" $spec.in; } > $spec.tmp && mv $spec.tmp $spec
|
||||
done
|
||||
|
||||
# assuming hilbert has no such dir
|
||||
#if test -x /mounts/work/src/bin/tools/prepare_spec; then
|
||||
# /mounts/work/src/bin/tools/prepare_spec $spec > $spec.tmp && mv $spec.tmp $spec
|
||||
#fi
|
||||
done
|
||||
|
||||
osc service localrun format_spec_file
|
||||
|
||||
Loading…
Reference in New Issue
Block a user