Trying to make this a real link to Factory without too much added files

OBS-URL: https://build.opensuse.org/package/show/Base:System/dbus-1?expand=0&rev=141
This commit is contained in:
Fridrich Strba 2013-11-27 18:47:42 +00:00 committed by Git OBS Bridge
parent 08687bf4b5
commit 419b7efa89
13 changed files with 0 additions and 5193 deletions

View File

@ -1,4 +0,0 @@
dbus-1
dbus-1-devel
requires "libdbus-1-3-<targettype> = <version>"
libdbus-1-3

File diff suppressed because it is too large Load Diff

View File

@ -1,290 +0,0 @@
#
# spec file for package dbus-1-x11
#
# Copyright (c) 2013 SUSE LINUX Products 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 with_systemd 1
%bcond_without docs
Name: dbus-1-x11
%define _name dbus
BuildRequires: pkgconfig(x11)
Url: http://dbus.freedesktop.org/
Summary: D-Bus Message Bus System
License: GPL-2.0+ or AFL-2.1
Group: System/Daemons
BuildRequires: audit-devel
BuildRequires: doxygen
BuildRequires: update-desktop-files
BuildRequires: xmlto
# COMMON1-BEGIN
# COMMON1-BEGIN
%if ! %{with_systemd}
%if 0%{?suse_version} < 1230
%define _unitdir /lib/systemd/system
%else
%define _unitdir /usr/lib/systemd/system
%endif
%endif
%if %{with_systemd}
BuildRequires: pkgconfig(libsystemd-daemon)
BuildRequires: pkgconfig(libsystemd-login)
%endif
BuildRequires: libexpat-devel
BuildRequires: libtool
BuildRequires: pkg-config
Version: 1.7.8
Release: 0
#
Source0: http://dbus.freedesktop.org/releases/dbus/%{_name}-%{version}.tar.gz
Source1: rc.boot.dbus
Source2: dbus-1.desktop
Source3: dbus_at_console.ck
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
%bcond_without selinux
%if %{with selinux}
BuildRequires: libselinux-devel
%endif
BuildRequires: libcap-ng-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-build
# COMMON1-END
# COMMON1-END
%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}
%if 0%{?suse_version} >= 1120
BuildArch: noarch
%endif
%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
# bug437293
%ifarch ppc64
Obsoletes: dbus-1-64bit
%endif
%if 0%{?suse_version} < 1230
PreReq: /sbin/insserv /etc/init.d/boot.localfs
%endif
PreReq: permissions /usr/sbin/groupadd /usr/sbin/useradd
%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 -n %{_name}-%{version} -q
%patch0 -p1
%patch1 -p1
%build
autoreconf -fi
# We use -fpie/-pie for the whole build; this is the recommended way to harden
# the build upstream, see discussion in fdo#46570
export CFLAGS="${RPM_OPT_FLAGS} -fno-strict-aliasing -fPIC -fpie"
export LDFLAGS="-pie"
export CXXFLAGS="${RPM_OPT_FLAGS} -fno-strict-aliasing"
%if 0%{?suse_version} > 1000
export CFLAGS="$CFLAGS -fstack-protector"
export CXXFLAGS="$CXXFLAGS -fstack-protector"
export V=1
%endif
%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
%if %{with_systemd}
--enable-systemd \
%endif
--enable-libaudit \
--with-console-auth-dir=/run/dbus/at_console/ \
--with-system-pid-file=/run/dbus/pid \
--with-system-socket=/run/dbus/system_bus_socket \
--with-systemdsystemunitdir=%{_unitdir}
make %{?_smp_mflags}
%if %{with docs}
doxygen -u && doxygen
./cleanup-man-pages.sh
%endif
%install
# COMMON2-END
# COMMON2-END
make DESTDIR=%{buildroot} install
mkdir -p %{buildroot}/%{_bindir}
mkdir -p %{buildroot}/%{_mandir}/man1
mkdir -p %{buildroot}/etc/init.d
mkdir -p %{buildroot}/usr/sbin
mv %{buildroot}/bin/dbus-launch %{buildroot}/%{_bindir}
mv %{buildroot}/bin/dbus-run-session %{buildroot}/%{_bindir}
install -m 755 %{SOURCE1} %{buildroot}/%{_sysconfdir}/init.d/dbus
ln -sf %{_sysconfdir}/init.d/dbus %{buildroot}/%{_sbindir}/rcdbus
install -d %{buildroot}/run/dbus
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}/usr/bin
ln -sf /bin/dbus-send %{buildroot}/usr/bin/dbus-send
%verifyscript -n dbus-1
%verify_permissions -e /lib/dbus-1/dbus-daemon-launch-helper
%pre -n dbus-1
/usr/sbin/groupadd -r messagebus 2> /dev/null || :
/usr/sbin/useradd -r -s /bin/false -c "User for D-Bus" -d /run/dbus -g messagebus messagebus 2> /dev/null || :
%preun -n dbus-1
%{stop_on_removal dbus}
%post -n dbus-1
/bin/dbus-uuidgen --ensure
%{insserv_force_if_yast dbus}
/sbin/ldconfig
%set_permissions /lib/dbus-1/dbus-daemon-launch-helper
%postun -n dbus-1
%{insserv_cleanup}
%files
%defattr(-,root,root)
%{_bindir}/dbus-launch
%{_bindir}/dbus-run-session
%{_mandir}/man1/dbus-launch.1*
%{_mandir}/man1/dbus-run-session.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
%{_sysconfdir}/init.d/dbus
%{_sysconfdir}/ConsoleKit
/bin/dbus-cleanup-sockets
/bin/dbus-daemon
/bin/dbus-monitor
/bin/dbus-send
/usr/bin/dbus-send
/bin/dbus-uuidgen
%{_mandir}/man1/dbus-cleanup-sockets.1.*
%{_mandir}/man1/dbus-daemon.1.*
%{_mandir}/man1/dbus-monitor.1.*
%{_mandir}/man1/dbus-send.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
%ghost /run/dbus
%ghost %{_localstatedir}/lib/dbus/machine-id
%if ! %{with_systemd}
%if 0%{?suse_version} < 1230
%dir /lib/systemd
%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 dbus-1-devel-doc
%defattr(-,root,root)
%dir %{_datadir}/doc/dbus
%{_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 doc/*.txt doc/file-boilerplate.c doc/TODO
%{_datadir}/susehelp
%changelog

View File

@ -1,207 +0,0 @@
#
# spec file for package dbus-1-x11 (Version 1.4.1)
#
# Copyright (c) 2011 SUSE LINUX Products 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 with_systemd 1
%bcond_without docs
Name: dbus-1-x11
%define _name dbus
BuildRequires: pkgconfig(x11)
Url: http://dbus.freedesktop.org/
License: GPL2+ or AFL 2.1
Group: System/Daemons
Summary: D-Bus Message Bus System
BuildRequires: audit-devel
BuildRequires: doxygen
BuildRequires: update-desktop-files
BuildRequires: xmlto
# COMMON1-BEGIN
# COMMON1-END
%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}
%if 0%{?suse_version} >= 1120
BuildArch: noarch
%endif
%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
# bug437293
%ifarch ppc64
Obsoletes: dbus-1-64bit
%endif
%if 0%{?suse_version} < 1230
PreReq: /sbin/insserv /etc/init.d/boot.localfs
%endif
PreReq: permissions /usr/sbin/groupadd /usr/sbin/useradd
%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}/etc/init.d
mkdir -p %{buildroot}/usr/sbin
mv %{buildroot}/bin/dbus-launch %{buildroot}/%{_bindir}
mv %{buildroot}/bin/dbus-run-session %{buildroot}/%{_bindir}
install -m 755 %{SOURCE1} %{buildroot}/%{_sysconfdir}/init.d/dbus
ln -sf %{_sysconfdir}/init.d/dbus %{buildroot}/%{_sbindir}/rcdbus
install -d %{buildroot}/run/dbus
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}/usr/bin
ln -sf /bin/dbus-send %{buildroot}/usr/bin/dbus-send
%verifyscript -n dbus-1
%verify_permissions -e /lib/dbus-1/dbus-daemon-launch-helper
%pre -n dbus-1
/usr/sbin/groupadd -r messagebus 2> /dev/null || :
/usr/sbin/useradd -r -s /bin/false -c "User for D-Bus" -d /run/dbus -g messagebus messagebus 2> /dev/null || :
%preun -n dbus-1
%{stop_on_removal dbus}
%post -n dbus-1
/bin/dbus-uuidgen --ensure
%{insserv_force_if_yast dbus}
/sbin/ldconfig
%set_permissions /lib/dbus-1/dbus-daemon-launch-helper
%postun -n dbus-1
%{insserv_cleanup}
%files
%defattr(-,root,root)
%{_bindir}/dbus-launch
%{_bindir}/dbus-run-session
%{_mandir}/man1/dbus-launch.1*
%{_mandir}/man1/dbus-run-session.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
%{_sysconfdir}/init.d/dbus
%{_sysconfdir}/ConsoleKit
/bin/dbus-cleanup-sockets
/bin/dbus-daemon
/bin/dbus-monitor
/bin/dbus-send
/usr/bin/dbus-send
/bin/dbus-uuidgen
%{_mandir}/man1/dbus-cleanup-sockets.1.*
%{_mandir}/man1/dbus-daemon.1.*
%{_mandir}/man1/dbus-monitor.1.*
%{_mandir}/man1/dbus-send.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
%ghost /run/dbus
%ghost %{_localstatedir}/lib/dbus/machine-id
%if ! %{with_systemd}
%if 0%{?suse_version} < 1230
%dir /lib/systemd
%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 dbus-1-devel-doc
%defattr(-,root,root)
%dir %{_datadir}/doc/dbus
%{_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 doc/*.txt doc/file-boilerplate.c doc/TODO
%{_datadir}/susehelp
%changelog

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:df9306de6a5a92ce1a1872a573eb3604c80c3abfde811519f50aec010099a6cd
size 1839231

File diff suppressed because it is too large Load Diff

View File

@ -1,4 +0,0 @@
[Desktop Entry]
Name=D-Bus API Documentation
DocPath=/usr/share/doc/packages/dbus-1-devel/html/index.html
X-DOC-SearchMethod=htdig

View File

@ -1,205 +0,0 @@
#
# spec file for package dbus-1
#
# Copyright (c) 2013 SUSE LINUX Products 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 with_systemd 0
%bcond_with docs
Name: dbus-1
%define _name dbus
%define _libname libdbus-1-3
Url: http://dbus.freedesktop.org/
Summary: D-Bus Message Bus System
License: GPL-2.0+ or AFL-2.1
Group: System/Daemons
# COMMON1-BEGIN
%if ! %{with_systemd}
%if 0%{?suse_version} < 1230
%define _unitdir /lib/systemd/system
%else
%define _unitdir /usr/lib/systemd/system
%endif
%endif
%if %{with_systemd}
BuildRequires: pkgconfig(libsystemd-daemon)
BuildRequires: pkgconfig(libsystemd-login)
%endif
BuildRequires: libexpat-devel
BuildRequires: libtool
BuildRequires: pkg-config
Version: 1.7.8
Release: 0
#
Source0: http://dbus.freedesktop.org/releases/dbus/%{_name}-%{version}.tar.gz
Source1: rc.boot.dbus
Source2: dbus-1.desktop
Source3: dbus_at_console.ck
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
%bcond_without selinux
%if %{with selinux}
BuildRequires: libselinux-devel
%endif
BuildRequires: libcap-ng-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-build
# COMMON1-END
%package -n %{_libname}
Summary: Library package for D-Bus
Group: Development/Libraries/Other
%package -n dbus-1-devel
Summary: Developer package for D-Bus
Group: Development/Libraries/Other
Requires: %{_libname} = %{version}
Requires: dbus-1
Requires: glibc-devel
%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
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).
%description -n %{_libname}
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).
%description -n dbus-1-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
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 -n %{_name}-%{version} -q
%patch0 -p1
%patch1 -p1
%build
autoreconf -fi
# We use -fpie/-pie for the whole build; this is the recommended way to harden
# the build upstream, see discussion in fdo#46570
export CFLAGS="${RPM_OPT_FLAGS} -fno-strict-aliasing -fPIC -fpie"
export LDFLAGS="-pie"
export CXXFLAGS="${RPM_OPT_FLAGS} -fno-strict-aliasing"
%if 0%{?suse_version} > 1000
export CFLAGS="$CFLAGS -fstack-protector"
export CXXFLAGS="$CXXFLAGS -fstack-protector"
export V=1
%endif
%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
%if %{with_systemd}
--enable-systemd \
%endif
--enable-libaudit \
--with-console-auth-dir=/run/dbus/at_console/ \
--with-system-pid-file=/run/dbus/pid \
--with-system-socket=/run/dbus/system_bus_socket \
--with-systemdsystemunitdir=%{_unitdir}
make %{?_smp_mflags}
%if %{with docs}
doxygen -u && doxygen
./cleanup-man-pages.sh
%endif
%install
# COMMON2-END
tdir=$(mktemp -d)
make DESTDIR=$tdir 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
# 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
for i in /etc/dbus-1/session.d /etc/dbus-1/system.d \
/usr/share/dbus-1/interfaces /usr/share/dbus-1/services /usr/share/dbus-1/system-services; do
mkdir -p %{buildroot}$i
done
%post -n %{_libname} -p /sbin/ldconfig
%postun -n %{_libname} -p /sbin/ldconfig
%files -n %{_libname}
%defattr(-, root, root)
/%{_lib}/libdbus-1.so.*
# Own those directories in the library instead of dbus-1, since dbus users
# often ship files there
%dir %{_sysconfdir}/dbus-1
%dir %{_sysconfdir}/dbus-1/session.d
%dir %{_sysconfdir}/dbus-1/system.d
%dir %{_datadir}/dbus-1
%dir %{_datadir}/dbus-1/interfaces
%dir %{_datadir}/dbus-1/services
%dir %{_datadir}/dbus-1/system-services
%files -n dbus-1-devel
%defattr(-,root,root)
%{_includedir}/*
%{_libdir}/libdbus-1.so
%dir %{_libdir}/dbus-1.0
%{_libdir}/dbus-1.0/include
%{_libdir}/pkgconfig/dbus-1.pc
%changelog

View File

@ -1,26 +0,0 @@
From: Stephan Kulow <coolo@suse.de>
We want x11 autolaunch even if we have no x11 in the build environment
Index: dbus-1.6.8/dbus/dbus-sysdeps-unix.c
===================================================================
--- dbus-1.6.8.orig/dbus/dbus-sysdeps-unix.c
+++ dbus-1.6.8/dbus/dbus-sysdeps-unix.c
@@ -3230,7 +3230,7 @@ _dbus_get_tmpdir(void)
return tmpdir;
}
-#if defined(DBUS_ENABLE_X11_AUTOLAUNCH) || defined(DBUS_ENABLE_LAUNCHD)
+#if 1
/**
* Execute a subprocess, returning up to 1024 bytes of output
* into @p result.
@@ -3450,7 +3450,7 @@ _dbus_get_autolaunch_address (const char *scope,
DBusString *address,
DBusError *error)
{
-#ifdef DBUS_ENABLE_X11_AUTOLAUNCH
+#if 1
/* Perform X11-based autolaunch. (We also support launchd-based autolaunch,
* but that's done elsewhere, and if it worked, this function wouldn't
* be called.) */

View File

@ -1,11 +0,0 @@
--- a/bus/system.conf.in
+++ b/bus/system.conf.in
@@ -48,7 +48,7 @@
<!-- Holes must be punched in service configuration files for
name ownership and sending method calls -->
<deny own="*"/>
- <deny send_type="method_call"/>
+ <deny send_type="method_call" log="true"/>
<!-- Signals and reply messages (method returns, errors) are allowed
by default -->

View File

@ -1,27 +0,0 @@
#!/bin/bash
#
# use consolekit to support legacy at_console setting
#
reason="$1"
dir=/var/run/dbus/at_console
# for at_console we are only interested in local sessions
test "$CK_SESSION_IS_LOCAL" = true || exit 0
test "$reason" = "session_added" -o "$reason" = "session_removed" || exit 0
sessid=${CK_SESSION_ID##*/}
sessid=${sessid//[^A-Za-z0-9]/_}
test -n "$sessid" || exit 1
name=`getent passwd "$CK_SESSION_USER_UID" 2>/dev/null | awk -F: '{print $1}'`
test -n "$name" || exit 1
if test "$reason" = "session_added"; then
mkdir -p "$dir/$name"
touch "$dir/$name/$sessid"
else
rm "$dir/$name/$sessid"
rmdir "$dir/$name"
fi

View File

@ -1,22 +0,0 @@
#!/bin/bash
# vim:sw=4 et
# This script is called automatically during autobuild checkin.
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

View File

@ -1,124 +0,0 @@
#!/bin/sh
# Author: Timo Hoenig <thoenig@suse.de>
#
# /etc/init.d/dbus
#
### BEGIN INIT INFO
# Provides: dbus
# Required-Start: $local_fs
# Should-Start:
# Required-Stop: $local_fs
# Should-Stop:
# Default-Start: 2 3 5
# Default-Stop:
# Short-Description: D-Bus is a message bus system for applications to talk to one another.
# Description: 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).
### END INIT INFO
DBUS_DAEMON_BIN=/bin/dbus-daemon
test -x $DBUS_DAEMON_BIN || exit 5
DBUS_DAEMON_PARAMETER="--system";
DBUS_DAEMON_PID_DIR="/run/dbus"
DBUS_DAEMON_PID=$DBUS_DAEMON_PID_DIR/pid
DBUS_MACHINE_ID_DIR="/var/lib/dbus"
DBUS_MACHINE_ID=$DBUS_MACHINE_ID_DIR/machine-id
SYSTEM_MACHINE_ID="/etc/machine-id"
DBUS_UUIIDGEN_BIN=/bin/dbus-uuidgen
CONSOLEKIT_DAEMON_BIN="/usr/sbin/console-kit-daemon"
CONSOLEKIT_PID_DIR="/var/run/ConsoleKit"
CONSOLEKIT_PID=$CONSOLEKIT_PID_DIR/pid
# Source LSB init functions
# providing start_daemon, killproc, pidofproc,
# log_success_msg, log_failure_msg and log_warning_msg.
# This is currently not used by UnitedLinux based distributions and
# not needed for init scripts for UnitedLinux only. If it is used,
# the functions from rc.status should not be sourced or used.
#. /lib/lsb/init-functions
. /etc/rc.status
# Reset status of this service
rc_reset
case "$1" in
start)
if [ -x $DBUS_UUIIDGEN_BIN -a ! -e $DBUS_MACHINE_ID -a ! -e $SYSTEM_MACHINE_ID ] ; then
if [ ! -d $DBUS_MACHINE_ID_DIR ] ; then
mkdir -p $DBUS_MACHINE_ID_DIR
chown messagebus:messagebus $DBUS_MACHINE_ID_DIR
fi
echo -n "Creating universally unique ID..."
$DBUS_UUIIDGEN_BIN --ensure
rc_status -v
fi
if checkproc -k -p $DBUS_DAEMON_PID $DBUS_DAEMON_BIN ; then
echo "D-Bus already started. Not starting."
exit 0
fi
if [ ! -d $DBUS_DAEMON_PID_DIR ] ; then
mkdir -p $DBUS_DAEMON_PID_DIR
chown messagebus:messagebus $DBUS_DAEMON_PID_DIR
fi
if [ -e $DBUS_DAEMON_PID ] ; then
echo "Removing stale PID file $DBUS_DAEMON_PID."
rm -f $DBUS_DAEMON_PID
fi
echo -n "Starting D-Bus daemon"
start_daemon -f $DBUS_DAEMON_BIN $DBUS_DAEMON_PARAMETER
rc_status -v
;;
stop)
echo -n "Shutting down D-Bus daemon"
if [ -x $CONSOLEKIT_DAEMON_BIN ] ; then
killproc -p $CONSOLEKIT_PID -TERM $CONSOLEKIT_DAEMON_BIN
fi
killproc -p $DBUS_DAEMON_PID -TERM $DBUS_DAEMON_BIN
rc_status -v
;;
try-restart)
$0 status >/dev/null && $0 restart
rc_status
;;
restart)
$0 stop
$0 start
rc_status
;;
force-reload)
$0 reload
rc_status
;;
reload)
echo -n "Reload service D-Bus daemon"
dbus-send --type=method_call --system --dest=org.freedesktop.DBus / org.freedesktop.DBus.ReloadConfig
rc_status -v
;;
status)
echo -n "Checking for service D-Bus daemon"
checkproc -k -p $DBUS_DAEMON_PID $DBUS_DAEMON_BIN
if [ $? -eq 7 ]; then
rc_failed 3
fi
rc_status -v
;;
probe)
## Optional: Probe for the necessity of a reload, print out the
## argument to this init script which is required for a reload.
## Note: probe is not (yet) part of LSB (as of 1.2)
# test /etc/FOO/FOO.conf -nt /var/run/FOO.pid && echo reload
;;
*)
echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload|probe}"
exit 1
;;
esac
rc_exit