Accepting request 765601 from home:StefanBruens:branches:Base:System
- Move generation of API docs to a separate package, avoid doxygen dependency for building main package. - Build x11 and devel-doc (API doc) using _multibuild. - Drop no longer required call to autoreconf, remove obsolete BuildRequires for libtool and autoconf-archive. OBS-URL: https://build.opensuse.org/request/show/765601 OBS-URL: https://build.opensuse.org/package/show/Base:System/dbus-1?expand=0&rev=292
This commit is contained in:
Git OBS Bridge
parent
b8daf232e5
commit
b91aa737db
4
_multibuild
Normal file
4
_multibuild
Normal file
@ -0,0 +1,4 @@
|
||||
<multibuild>
|
||||
<package>dbus-1-x11</package>
|
||||
<package>dbus-1-devel-doc</package>
|
||||
</multibuild>
|
||||
127
dbus-1-devel-doc.spec
Normal file
127
dbus-1-devel-doc.spec
Normal file
@ -0,0 +1,127 @@
|
||||
#
|
||||
# spec file for package dbus-1-devel-doc
|
||||
#
|
||||
# Copyright (c) 2020 SUSE LLC
|
||||
#
|
||||
# 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 https://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
|
||||
%define with_systemd 1
|
||||
%define _name dbus
|
||||
%define _libname libdbus-1-3
|
||||
# Temporary code to disable service restart on update sflees@suse.de boo#1020301
|
||||
%global _backup %{_sysconfdir}/sysconfig/services.rpmbak.%{name}-%{version}-%{release}
|
||||
|
||||
%bcond_without selinux
|
||||
Name: dbus-1-devel-doc
|
||||
Version: 1.12.16
|
||||
Release: 0
|
||||
Summary: Developer documentation package for D-Bus
|
||||
License: GPL-2.0-or-later OR AFL-2.1
|
||||
Group: Development/Libraries/Other
|
||||
URL: http://dbus.freedesktop.org/
|
||||
Source0: http://dbus.freedesktop.org/releases/dbus/%{_name}-%{version}.tar.gz
|
||||
Source1: http://dbus.freedesktop.org/releases/dbus/%{_name}-%{version}.tar.gz.asc
|
||||
Source2: dbus-1.keyring
|
||||
Source3: baselibs.conf
|
||||
Source4: dbus-1.desktop
|
||||
Patch0: feature-suse-log-deny.patch
|
||||
# PATCH-FIX-OPENSUSE coolo@suse.de -- force a feature configure won't accept without x11 in buildrequires
|
||||
Patch1: feature-suse-do-autolaunch.patch
|
||||
# Patch-Feature-opensuse sflees@suse.de, users shouldn't be allowed to start / stop the dbus service.
|
||||
Patch2: feature-suse-refuse-manual-start-stop.patch
|
||||
BuildRequires: doxygen
|
||||
BuildRequires: libexpat-devel >= 2.1.0
|
||||
BuildRequires: xmlto
|
||||
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
|
||||
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
|
||||
%setup -q -n %{_name}-%{version}
|
||||
%autopatch -p1
|
||||
|
||||
%build
|
||||
echo 'HTML_TIMESTAMP=NO' >> Doxyfile.in
|
||||
# Skip generation of API doc manpages we do not ship
|
||||
echo 'GENERATE_MAN=NO' >> Doxyfile.in
|
||||
|
||||
%configure \
|
||||
--disable-static \
|
||||
--libexecdir=%{_libexecdir}/dbus-1 \
|
||||
--enable-doxygen-docs \
|
||||
--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} \
|
||||
--with-systemduserunitdir=%{_userunitdir} \
|
||||
--without-x
|
||||
|
||||
doxygen -u
|
||||
make -C doc
|
||||
|
||||
%install
|
||||
%make_install -C doc
|
||||
|
||||
# Remove manpages for commandline tools (shipped in main package)
|
||||
rm -Rf %{buildroot}/%{_mandir}/man1/*
|
||||
rmdir -p --ignore-fail-on-non-empty %{buildroot}/%{_mandir}/man1
|
||||
|
||||
# Remove DTDs (shipped in devel subpackage)
|
||||
rm -Rf %{buildroot}/%{_datadir}/xml/dbus-1/*dtd
|
||||
rmdir -p --ignore-fail-on-non-empty %{buildroot}/%{_datadir}/xml/dbus-1
|
||||
|
||||
mkdir -p %{buildroot}/%{_datadir}/susehelp/meta/Development/Libraries/
|
||||
install -m 0644 %{SOURCE4} \
|
||||
%{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}/doc/dbus/examples/
|
||||
install -m 0644 tools/GetAllMatchRules.py %{buildroot}%{_datadir}/doc/dbus/examples/
|
||||
install -m 0644 bus/example-*-stats.conf %{buildroot}%{_datadir}/doc/dbus/examples/
|
||||
|
||||
%files
|
||||
%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.devhelp2
|
||||
%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
|
||||
3162
dbus-1-x11.changes
3162
dbus-1-x11.changes
File diff suppressed because it is too large
Load Diff
@ -41,7 +41,7 @@ Patch1: feature-suse-do-autolaunch.patch
|
||||
Patch2: feature-suse-refuse-manual-start-stop.patch
|
||||
BuildRequires: autoconf-archive
|
||||
BuildRequires: libcap-ng-devel
|
||||
BuildRequires: libexpat-devel
|
||||
BuildRequires: libexpat-devel >= 2.1.0
|
||||
BuildRequires: libtool
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: pkgconfig(libsystemd) >= 209
|
||||
|
||||
@ -1,3 +1,16 @@
|
||||
-------------------------------------------------------------------
|
||||
Sun Jan 19 02:59:34 UTC 2020 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
|
||||
|
||||
- Move generation of API docs to a separate package, avoid doxygen
|
||||
dependency for building main package.
|
||||
- Build x11 and devel-doc (API doc) using _multibuild.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Jan 19 01:53:25 UTC 2020 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
|
||||
|
||||
- Drop no longer required call to autoreconf, remove obsolete
|
||||
BuildRequires for libtool and autoconf-archive.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jan 17 13:02:10 UTC 2020 - Thorsten Kukuk <kukuk@suse.com>
|
||||
|
||||
|
||||
57
dbus-1.spec
57
dbus-1.spec
@ -40,11 +40,8 @@ Patch1: feature-suse-do-autolaunch.patch
|
||||
# Patch-Feature-opensuse sflees@suse.de, users shouldn't be allowed to start / stop the dbus service.
|
||||
Patch2: feature-suse-refuse-manual-start-stop.patch
|
||||
BuildRequires: audit-devel
|
||||
BuildRequires: autoconf-archive
|
||||
BuildRequires: doxygen
|
||||
BuildRequires: libcap-ng-devel
|
||||
BuildRequires: libexpat-devel >= 2.1.0
|
||||
BuildRequires: libtool
|
||||
BuildRequires: permissions
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: sysuser-shadow
|
||||
@ -72,12 +69,6 @@ Requires: %{_libname} = %{version}
|
||||
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
|
||||
@ -102,21 +93,12 @@ 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
|
||||
%setup -q -n %{_name}-%{version}
|
||||
%autopatch -p1
|
||||
|
||||
%build
|
||||
echo 'HTML_TIMESTAMP=NO' >> Doxyfile.in
|
||||
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="%{optflags} -fno-strict-aliasing -fPIC -fpie"
|
||||
@ -127,7 +109,7 @@ export V=1
|
||||
--disable-static \
|
||||
--libexecdir=%{_libexecdir}/dbus-1 \
|
||||
--enable-inotify \
|
||||
--enable-doxygen-docs \
|
||||
--disable-doxygen-docs \
|
||||
%if %{with selinux}
|
||||
--enable-selinux \
|
||||
%endif
|
||||
@ -146,9 +128,6 @@ make %{?_smp_mflags}
|
||||
cp %{SOURCE5} bus/sysusers.d/dbus.conf
|
||||
%sysusers_generate_pre %{SOURCE5} messagebus
|
||||
|
||||
doxygen -u && doxygen
|
||||
./cleanup-man-pages.sh
|
||||
|
||||
%check
|
||||
make %{?_smp_mflags} check
|
||||
|
||||
@ -161,9 +140,6 @@ mv -f %{buildroot}/%{_bindir}/dbus-launch %{buildroot}%{_bindir}/dbus-launch.nox
|
||||
mkdir -p %{buildroot}%{_sbindir}
|
||||
ln -sf %{_sbindir}/service %{buildroot}/%{_sbindir}/rcdbus
|
||||
install -d %{buildroot}/run/dbus
|
||||
mkdir -p %{buildroot}/%{_datadir}/susehelp/meta/Development/Libraries/
|
||||
install -m 0644 %{SOURCE4} \
|
||||
%{buildroot}/%{_datadir}/susehelp/meta/Development/Libraries/dbus-1.desktop
|
||||
mkdir -p %{buildroot}/%{_libdir}/pkgconfig
|
||||
mkdir -p %{buildroot}/lib/dbus-1/system-services
|
||||
|
||||
@ -175,9 +151,6 @@ done
|
||||
|
||||
mkdir -p %{buildroot}%{_localstatedir}/lib/dbus
|
||||
|
||||
# don't ship executables in doc
|
||||
chmod -x %{buildroot}%{_datadir}/doc/dbus/examples/GetAllMatchRules.py
|
||||
|
||||
# Link the binaries that were in /bin back to /bin for compat (maybe remove for SLE-16)
|
||||
# Currently required to make upower work together with systemd
|
||||
mkdir -p %{buildroot}/bin
|
||||
@ -195,6 +168,8 @@ ln -s -f %{_sysconfdir}/alternatives/dbus-launch %{buildroot}%{_bindir}/dbus-lau
|
||||
|
||||
find %{buildroot} -type f -name "*.la" -delete -print
|
||||
|
||||
rm -Rf %{buildroot}%{_datadir}/doc/dbus
|
||||
|
||||
%verifyscript -n dbus-1
|
||||
%verify_permissions -e %{_libexecdir}/dbus-1/dbus-daemon-launch-helper
|
||||
|
||||
@ -312,30 +287,4 @@ fi
|
||||
%{_libdir}/cmake/
|
||||
%{_datadir}/xml/dbus-1
|
||||
|
||||
%files devel-doc
|
||||
%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.devhelp2
|
||||
%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
|
||||
|
||||
@ -2,6 +2,4 @@
|
||||
# vim:sw=4 et
|
||||
# This script is called automatically during autobuild checkin.
|
||||
|
||||
cp -lf dbus-1.changes dbus-1-x11.changes
|
||||
|
||||
osc service localrun format_spec_file
|
||||
|
||||
Loading…
Reference in New Issue
Block a user