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

Accepting request 961966 from Base:System

Browse Source 
- set runstatedir correctly

OBS-URL: https://build.opensuse.org/request/show/961966
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dbus-1?expand=0&rev=170
This commit is contained in:
Dominique Leuenberger 2022-03-16 20:30:31 +00:00 committed by Git OBS Bridge
commit 63a30f45a2
4 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dbus-1-devel-doc.spec
View File

@ -61,12 +61,16 @@ bus daemon).
%build %build
echo 'HTML_TIMESTAMP=NO' >> Doxyfile.in echo 'HTML_TIMESTAMP=NO' >> Doxyfile.in
# Skip generation of API doc manpages we do not ship # We use -fpie/-pie for the whole build; this is the recommended way to harden
echo 'GENERATE_MAN=NO' >> Doxyfile.in # the build upstream, see discussion in fdo#46570
export CFLAGS="%{optflags} -fno-strict-aliasing -fPIC -fpie"
export LDFLAGS="-pie"
export CXXFLAGS="%{optflags} -fno-strict-aliasing"
export V=1
%configure \ %configure \
--disable-static \ --disable-static \
--libexecdir=%{_libexecdir}/dbus-1 \ --libexecdir=%{_libexecdir}/dbus-1 \
--runstatedir=%{_rundir} \
--enable-doxygen-docs \ --enable-doxygen-docs \
--with-console-auth-dir=/run/dbus/at_console/ \ --with-console-auth-dir=/run/dbus/at_console/ \
--with-system-pid-file=/run/dbus/pid \ --with-system-pid-file=/run/dbus/pid \

4
dbus-1-x11.spec
View File

@ -67,7 +67,6 @@ in this separate package so server systems need not install X.
%build %build
echo 'HTML_TIMESTAMP=NO' >> Doxyfile.in echo 'HTML_TIMESTAMP=NO' >> Doxyfile.in
autoreconf -fi
# We use -fpie/-pie for the whole build; this is the recommended way to harden # We use -fpie/-pie for the whole build; this is the recommended way to harden
# the build upstream, see discussion in fdo#46570 # the build upstream, see discussion in fdo#46570
export CFLAGS="%{optflags} -fno-strict-aliasing -fPIC -fpie" export CFLAGS="%{optflags} -fno-strict-aliasing -fPIC -fpie"
@ -76,9 +75,10 @@ export CXXFLAGS="%{optflags} -fno-strict-aliasing"
export V=1 export V=1
%configure \ %configure \
--disable-static \ --disable-static \
--runstatedir=%{_rundir} \
--libexecdir=%{_libexecdir}/dbus-1 \ --libexecdir=%{_libexecdir}/dbus-1 \
--enable-inotify \ --enable-inotify \
--disable-doxygen-docs \ --disable-doxygen-docs \
%if %{with selinux} %if %{with selinux}
--enable-selinux \ --enable-selinux \
%endif %endif

5
dbus-1.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Mar 14 10:46:30 UTC 2022 - Dirk Müller <dmueller@suse.com>
- set runstatedir correctly
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Mar 4 19:36:07 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com> Fri Mar 4 19:36:07 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>

6
dbus-1.spec
View File

@ -32,14 +32,12 @@ Source2: dbus-1.keyring
Source3: baselibs.conf Source3: baselibs.conf
Source4: dbus-1.desktop Source4: dbus-1.desktop
Source5: messagebus.conf Source5: messagebus.conf
# PATCH-FEATURE-OPENSUSE feature-suse-log-deny.patch # PATCH-FEATURE-OPENSUSE feature-suse-log-deny.patch
Patch0: feature-suse-log-deny.patch Patch0: feature-suse-log-deny.patch
# PATCH-FIX-OPENSUSE coolo@suse.de -- force a feature configure won't accept without x11 in buildrequires # PATCH-FIX-OPENSUSE coolo@suse.de -- force a feature configure won't accept without x11 in buildrequires
Patch1: feature-suse-do-autolaunch.patch Patch1: feature-suse-do-autolaunch.patch
# PATCH-FEATURE-OPENSUSE sflees@suse.de, users shouldn't be allowed to start / stop the dbus service. # 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 Patch2: feature-suse-refuse-manual-start-stop.patch
BuildRequires: alts BuildRequires: alts
BuildRequires: audit-devel BuildRequires: audit-devel
BuildRequires: cmake BuildRequires: cmake
@ -50,11 +48,10 @@ BuildRequires: pkgconfig
BuildRequires: sysuser-tools BuildRequires: sysuser-tools
BuildRequires: xmlto BuildRequires: xmlto
BuildRequires: pkgconfig(libsystemd) >= 209 BuildRequires: pkgconfig(libsystemd) >= 209
Requires: alts
Requires(post): %{_libname} = %{version} Requires(post): %{_libname} = %{version}
Requires(post): diffutils Requires(post): diffutils
Requires(pre): permissions Requires(pre): permissions
Requires: alts
Provides: dbus-launch Provides: dbus-launch
%sysusers_requires %sysusers_requires
%if %{with selinux} %if %{with selinux}
@ -108,6 +105,7 @@ export CXXFLAGS="%{optflags} -fno-strict-aliasing"
export V=1 export V=1
%configure \ %configure \
--disable-static \ --disable-static \
--runstatedir=%{_rundir} \
--libexecdir=%{_libexecdir}/dbus-1 \ --libexecdir=%{_libexecdir}/dbus-1 \
--enable-inotify \ --enable-inotify \
--disable-doxygen-docs \ --disable-doxygen-docs \