|
@@ -16,8 +16,8 @@
|
|
|
Summary: D-BUS message bus
|
|
|
Summary(ja): D-BUS メッセージバスシステム
|
|
|
Name: dbus
|
|
|
-Version: 1.14.10
|
|
|
-Release: 4%{?_dist_release}%{?with_systemd:.systemd}
|
|
|
+Version: 1.16.2
|
|
|
+Release: 1%{?_dist_release}%{?with_systemd:.systemd}
|
|
|
Group: system
|
|
|
Vendor: Project Vine
|
|
|
Distribution: Vine Linux
|
|
@@ -31,23 +31,28 @@ Source3: dbus.service
|
|
|
Source4: dbus.user.service
|
|
|
Source5: dbus.socket
|
|
|
Source6: dbus.user.socket
|
|
|
+Source7: dbus-systemd-sysusers.conf
|
|
|
Source1000: prepare-dbus-start.sh
|
|
|
|
|
|
# from fedora package
|
|
|
+Patch1: 0001-tools-Use-Python3-for-GetAllMatchRules.patch
|
|
|
|
|
|
# from gentoo
|
|
|
-Patch1000: dbus-enable-elogind.patch
|
|
|
+Patch1000: dbus-1.16.0-enable-elogind.patch
|
|
|
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
|
|
|
|
|
# default daemon
|
|
|
Requires: %{name}-daemon = %{version}-%{release}
|
|
|
|
|
|
+BuildRequires: meson
|
|
|
BuildRequires: autoconf-archive
|
|
|
BuildRequires: libtool
|
|
|
BuildRequires: expat-devel >= %{expat_version}
|
|
|
BuildRequires: libxml2-devel
|
|
|
-BuildRequires: python-devel
|
|
|
+BuildRequires: glib2-devel
|
|
|
+BuildRequires: audit-libs-devel
|
|
|
+BuildRequires: python3-devel
|
|
|
BuildRequires: doxygen
|
|
|
BuildRequires: xmlto
|
|
|
BuildRequires: libxslt
|
|
@@ -198,44 +203,53 @@ Headers and static libraries for D-BUS.
|
|
|
|
|
|
|
|
|
%build
|
|
|
-# Avoid rpath.
|
|
|
-if test -f autogen.sh; then env NOCONFIGURE=1 ./autogen.sh; else autoreconf --ve
|
|
|
-rbose --force --install; fi
|
|
|
-
|
|
|
-COMMON_ARGS="--enable-selinux=no \
|
|
|
+CONFIG_OPTIONS=(
|
|
|
+ --libexecdir=%{_libexecdir}/dbus-1
|
|
|
+ -Dlibaudit=enabled
|
|
|
+ -Dselinux=disabled
|
|
|
%if %{with systemd}
|
|
|
- SYSTEMCTL=/usr/bin/systemctl \
|
|
|
- --enable-systemd \
|
|
|
- --with-init-scripts=redhat \
|
|
|
- --with-systemdsystemunitdir=%{_unitdir} \
|
|
|
- --with-systemduserunitdir=%{_userunitdir} \
|
|
|
- --enable-user-session \
|
|
|
+ -Dsystemd_system_unitdir=%{_unitdir}
|
|
|
+ -Dsystemd_user_unitdir=%{_userunitdir}
|
|
|
%else
|
|
|
- --enable-elogind \
|
|
|
+ -Dsystemd=disabled
|
|
|
+ -Duser_session=false
|
|
|
+ -Delogind=enabled
|
|
|
%endif
|
|
|
- --enable-libaudit \
|
|
|
- --with-dbus-user=dbus \
|
|
|
- --libexecdir=%{_libexecdir}/dbus-1 \
|
|
|
- --docdir=%{_pkgdocdir} \
|
|
|
- --sysconfdir=%{_sysconfdir} --exec-prefix=/ \
|
|
|
- --runstatedir=%{_rundir} \
|
|
|
- --with-system-pid-file=/run/dbus/messagebus.pid \
|
|
|
- --with-system-socket=/run/dbus/system_bus_socket \
|
|
|
- "
|
|
|
-
|
|
|
-%configure $COMMON_ARGS --disable-tests --disable-verbose-mode --disable-asserts --enable-doxygen-docs --enable-xml-docs
|
|
|
-make V=1 %{?_smp_mflags}
|
|
|
+ -Dsystem_pid_file=/run/dbus/messagebus.pid
|
|
|
+ -Dsystem_socket=/run/dbus/system_bus_socket
|
|
|
+ -Ddbus_user=dbus
|
|
|
+ -Duser_session=true
|
|
|
+ -Ddoxygen_docs=enabled
|
|
|
+ -Dducktype_docs=disabled
|
|
|
+ -Dxml_docs=enabled
|
|
|
+ -Dasserts=false
|
|
|
+ -Dqt_help=disabled
|
|
|
+ -Dapparmor=disabled
|
|
|
+ -Dkqueue=disabled
|
|
|
+ -Dlaunchd=disabled
|
|
|
+)
|
|
|
+
|
|
|
+%meson \
|
|
|
+ "${CONFIG_OPTIONS[@]}"
|
|
|
+
|
|
|
+%meson_build
|
|
|
|
|
|
|
|
|
%install
|
|
|
-rm -rf %{buildroot}
|
|
|
+%meson_install
|
|
|
|
|
|
-%__make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
|
|
|
+# Delete python2 code
|
|
|
+rm -f %{buildroot}/%{_pkgdocdir}/examples/GetAllMatchRules.py
|
|
|
|
|
|
-find %{buildroot} -name '*.a' -type f -delete
|
|
|
-find %{buildroot} -name '*.la' -type f -delete
|
|
|
-
|
|
|
-install -Dp -m755 %{SOURCE1} %{buildroot}%{_sysconfdir}/X11/xinit/xinitrc.d/00-start-message-bus.sh
|
|
|
+%if %{with systemd}
|
|
|
+rm -rf %{buildroot}/var/run/dbus
|
|
|
+install -m644 %{SOURCE3} %{buildroot}%{_unitdir}/dbus.service
|
|
|
+install -m644 %{SOURCE4} %{buildroot}%{_userunitdir}/dbus.service
|
|
|
+install -m644 %{SOURCE5} %{buildroot}%{_unitdir}/dbus.socket
|
|
|
+install -m644 %{SOURCE6} %{buildroot}%{_userunitdir}/dbus.socket
|
|
|
+install -Dp -m644 %{SOURCE7} %{buildroot}%{_sysusersdir}/dbus.conf
|
|
|
+install -m755 %{SOURCE1000} %{buildroot}%{_libexecdir}/dbus-1/prepare-dbus-start.sh
|
|
|
+%endif
|
|
|
|
|
|
# Obsolete, but still widely used, for drop-in configuration snippets.
|
|
|
install --directory %{buildroot}%{_sysconfdir}/dbus-1/session.d
|
|
@@ -243,9 +257,9 @@ install --directory %{buildroot}%{_sysconfdir}/dbus-1/system.d
|
|
|
|
|
|
install --directory %{buildroot}%{_datadir}/dbus-1/interfaces
|
|
|
|
|
|
-%if %{with systemd}
|
|
|
-%__make install-data DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
|
|
|
+install -Dp -m755 %{SOURCE1} %{buildroot}%{_sysconfdir}/X11/xinit/xinitrc.d/00-start-message-bus.sh
|
|
|
|
|
|
+%if %{with systemd}
|
|
|
# Make sure that when somebody asks for D-Bus under the name of the
|
|
|
# old SysV script, that he ends up with the standard dbus.service name
|
|
|
# now.
|
|
@@ -312,17 +326,6 @@ EOF
|
|
|
|
|
|
install -pm 755 -t %{buildroot}%{_libexecdir}/dbus-1 dbus-run-installed-tests
|
|
|
|
|
|
-## vine stuff
|
|
|
-
|
|
|
-%if %{with systemd}
|
|
|
-rm -rf %{buildroot}/var/run/dbus
|
|
|
-install -m644 %{SOURCE3} %{buildroot}%{_unitdir}/dbus.service
|
|
|
-install -m644 %{SOURCE4} %{buildroot}%{_userunitdir}/dbus.service
|
|
|
-install -m644 %{SOURCE5} %{buildroot}%{_unitdir}/dbus.socket
|
|
|
-install -m644 %{SOURCE6} %{buildroot}%{_userunitdir}/dbus.socket
|
|
|
-install -m755 %{SOURCE1000} %{buildroot}%{_libexecdir}/dbus-1/prepare-dbus-start.sh
|
|
|
-%endif
|
|
|
-
|
|
|
|
|
|
%pre daemon
|
|
|
# Add the "dbus" user
|
|
@@ -424,7 +427,6 @@ fi
|
|
|
%endif
|
|
|
|
|
|
%files daemon
|
|
|
-%defattr(-,root,root)
|
|
|
%{!?_licensedir:%global license %%doc}
|
|
|
%license COPYING
|
|
|
%doc AUTHORS ChangeLog NEWS README
|
|
@@ -449,6 +451,7 @@ fi
|
|
|
%{_unitdir}/sockets.target.wants/dbus.socket
|
|
|
%{_userunitdir}/dbus.service
|
|
|
%{_userunitdir}/sockets.target.wants/dbus.socket
|
|
|
+%{_sysusersdir}/dbus.conf
|
|
|
%attr(0755,root,root) %{_libexecdir}/dbus-1/prepare-dbus-start.sh
|
|
|
%else
|
|
|
%{_sysconfdir}/rc.d/init.d/*
|
|
@@ -471,7 +474,6 @@ fi
|
|
|
%{_libdir}/*dbus-1*.so.*
|
|
|
|
|
|
%files devel
|
|
|
-%defattr(-,root,root)
|
|
|
%{_libdir}/lib*.so
|
|
|
%{_libdir}/dbus-1.0/include
|
|
|
%{_libdir}/pkgconfig/*
|
|
@@ -483,13 +485,11 @@ fi
|
|
|
%{_datadir}/xml/dbus-1/*
|
|
|
|
|
|
%files x11
|
|
|
-%defattr(-,root,root)
|
|
|
%{_bindir}/dbus-launch
|
|
|
%{_datadir}/man/man*/dbus-launch.1.gz
|
|
|
%{_sysconfdir}/X11/xinit/xinitrc.d/00-start-message-bus.sh
|
|
|
|
|
|
%files doc
|
|
|
-%defattr(-,root,root)
|
|
|
%{_pkgdocdir}/*
|
|
|
%{_datadir}/gtk-doc
|
|
|
|
|
@@ -499,13 +499,15 @@ fi
|
|
|
%{_libdir}/*dbus-1*.so.*
|
|
|
|
|
|
%files -n compat32-%{name}-devel
|
|
|
-%defattr(-,root,root)
|
|
|
%{_libdir}/lib*.so
|
|
|
%{_libdir}/dbus-1.0/include
|
|
|
%endif
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Thu Jun 12 2025 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.16.2-1
|
|
|
+- new upstream release.
|
|
|
+
|
|
|
* Wed Jul 03 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.14.10-4
|
|
|
- fixed systemd unit for usrmerge.
|
|
|
|