Hello community, here is the log from the commit of package dbus-1 for openSUSE:Factory checked in at 2019-05-10 09:08:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dbus-1 (Old) and /work/SRC/openSUSE:Factory/.dbus-1.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dbus-1" Fri May 10 09:08:43 2019 rev:157 rq:700434 version:1.12.12 Changes: -------- --- /work/SRC/openSUSE:Factory/dbus-1/dbus-1-x11.changes 2019-02-26 22:13:58.094241427 +0100 +++ /work/SRC/openSUSE:Factory/.dbus-1.new.5148/dbus-1-x11.changes 2019-05-10 09:08:55.134884378 +0200 @@ -1,0 +2,6 @@ +Wed Apr 24 09:27:11 UTC 2019 - Tomáš Chvátal <[email protected]> + +- Remove the Leap42 conditionals that cause file conflict with + filesystem package + +------------------------------------------------------------------- dbus-1.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dbus-1-x11.spec ++++++ --- /var/tmp/diff_new_pack.bk2F48/_old 2019-05-10 09:08:59.742897533 +0200 +++ /var/tmp/diff_new_pack.bk2F48/_new 2019-05-10 09:08:59.746897545 +0200 @@ -28,7 +28,7 @@ Summary: D-Bus Message Bus System License: GPL-2.0-or-later OR AFL-2.1 Group: System/Daemons -Url: http://dbus.freedesktop.org/ +URL: http://dbus.freedesktop.org/ Source0: http://dbus.freedesktop.org/releases/dbus/%{_name}-%{version}.tar.gz Source2: dbus-1.desktop Source3: dbus_at_console.ck @@ -74,7 +74,6 @@ export LDFLAGS="-pie" export CXXFLAGS="%{optflags} -fno-strict-aliasing" export V=1 -# is_opensuse was first defined after openSUSE 13.2 %configure \ --disable-static \ --libexecdir=%{_libexecdir}/dbus-1 \ @@ -86,15 +85,9 @@ --enable-systemd \ --enable-user-session \ --enable-libaudit \ -%if 0%{?suse_version} <= 1315 && !0%{?is_opensuse} - --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-systemduserunitdir=%{_userunitdir} \ --with-x @@ -117,7 +110,6 @@ fi %files -%defattr(-,root,root) %ghost %{_sysconfdir}/alternatives/dbus-launch %{_bindir}/dbus-launch %{_bindir}/dbus-launch.x11 ++++++ dbus-1.spec ++++++ --- /var/tmp/diff_new_pack.bk2F48/_old 2019-05-10 09:08:59.762897590 +0200 +++ /var/tmp/diff_new_pack.bk2F48/_new 2019-05-10 09:08:59.766897602 +0200 @@ -20,7 +20,7 @@ %define _name dbus %define _libname libdbus-1-3 # Temporary code to disable service restart on update [email protected] boo#1020301 -%global _backup /etc/sysconfig/services.rpmbak.%{name}-%{version}-%{release} +%global _backup %{_sysconfdir}/sysconfig/services.rpmbak.%{name}-%{version}-%{release} %if 0%{?suse_version} <= 1320 %define _userunitdir %{_prefix}/lib/systemd/user %endif @@ -31,7 +31,7 @@ Summary: D-Bus Message Bus System License: GPL-2.0-or-later OR AFL-2.1 Group: System/Daemons -Url: http://dbus.freedesktop.org/ +URL: http://dbus.freedesktop.org/ Source0: http://dbus.freedesktop.org/releases/dbus/%{_name}-%{version}.tar.gz Source2: dbus-1.desktop Source3: dbus_at_console.ck @@ -52,7 +52,7 @@ BuildRequires: libexpat-devel >= 2.1.0 BuildRequires: libtool BuildRequires: permissions -BuildRequires: pkg-config +BuildRequires: pkgconfig BuildRequires: update-desktop-files BuildRequires: xmlto BuildRequires: pkgconfig(libsystemd) >= 209 @@ -62,7 +62,6 @@ Requires(pre): shadow Requires(preun): update-alternatives Provides: dbus-launch -BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %{with selinux} BuildRequires: libselinux-devel %endif @@ -129,7 +128,6 @@ export LDFLAGS="-pie" export CXXFLAGS="%{optflags} -fno-strict-aliasing" export V=1 -# is_opensuse was first defined after openSUSE 13.2 %configure \ --disable-static \ --libexecdir=%{_libexecdir}/dbus-1 \ @@ -141,15 +139,9 @@ --enable-systemd \ --enable-user-session \ --enable-libaudit \ -%if 0%{?suse_version} <= 1315 && !0%{?is_opensuse} - --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-systemduserunitdir=%{_userunitdir} \ --without-x @@ -159,7 +151,7 @@ ./cleanup-man-pages.sh %check -make check +make %{?_smp_mflags} check %install %make_install @@ -169,11 +161,7 @@ mv -f %{buildroot}/%{_bindir}/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 @@ -218,13 +206,8 @@ %pre getent group messagebus >/dev/null || \ %{_sbindir}/groupadd -r messagebus -%if 0%{?suse_version} <= 1315 && !0%{?is_opensuse} -getent passwd messagebus >/dev/null || \ - %{_sbindir}/useradd -r -s /usr/bin/false -c "User for D-Bus" -d %{_localstatedir}/run/dbus -g messagebus messagebus -%else getent passwd messagebus >/dev/null || \ - %{_sbindir}/useradd -r -s /usr/bin/false -c "User for D-Bus" -d /run/dbus -g messagebus messagebus -%endif + %{_sbindir}/useradd -r -s %{_bindir}/false -c "User for D-Bus" -d /run/dbus -g messagebus messagebus %service_add_pre dbus.service dbus.socket # Lines below are temporary code to disable service restart on update [email protected] boo#1020301 @@ -234,19 +217,19 @@ # Get the current version if [ $1 -gt 1 ]; then - CURRENT_VER=$(/usr/bin/dbus-daemon --version 2>/dev/null| sed 's/^.*[^0-9]\([0-9]*\.[0-9]*\.[0-9]*\).*$/\1/' | head -1) + CURRENT_VER=$(%{_bindir}/dbus-daemon --version 2>/dev/null| sed 's/^.*[^0-9]\([0-9]*\.[0-9]*\.[0-9]*\).*$/\1/' | head -1) # If the current version is or less then 1.10.2 where this change was added then migration needs to be run # The following line will return 1.10.2 if its newer then the current version TEST_VER=$(printf "1.10.2\n$CURRENT_VER" | sort -Vr | head -1) if [ "$TEST_VER" = "1.10.12" ]; then - if [ -f /etc/sysconfig/services ]; then - cp -a /etc/sysconfig/services %{_backup} + if [ -f %{_sysconfdir}/sysconfig/services ]; then + cp -a %{_sysconfdir}/sysconfig/services %{_backup} else touch %{_backup} fi - cat >>/etc/sysconfig/services <<EOF + cat >>%{_sysconfdir}/sysconfig/services <<EOF # temporarily added by rpm update to avoid dbus service restart # backup saved in %{_backup} DISABLE_RESTART_ON_UPDATE="yes" @@ -270,7 +253,7 @@ %set_permissions %{_libexecdir}/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 -%tmpfiles_create %_tmpfilesdir/dbus.conf +%tmpfiles_create %{_tmpfilesdir}/dbus.conf %preun if [ "$1" = 0 ] ; then @@ -286,13 +269,12 @@ %posttrans # See comments in pre if [ -s "%{_backup}" ]; then - mv -f %{_backup} /etc/sysconfig/services + mv -f %{_backup} %{_sysconfdir}/sysconfig/services elif [ -e "%{_backup}" ]; then - rm -f /etc/sysconfig/services + rm -f %{_sysconfdir}/sysconfig/services fi %files -%defattr(-, root, root) %dir %{_localstatedir}/lib/dbus %dir /lib/dbus-1 %dir /lib/dbus-1/system-services @@ -319,24 +301,20 @@ /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* +%{_mandir}/man1/dbus-cleanup-sockets.1%{?ext_man} +%{_mandir}/man1/dbus-daemon.1%{?ext_man} +%{_mandir}/man1/dbus-monitor.1%{?ext_man} +%{_mandir}/man1/dbus-run-session.1%{?ext_man} +%{_mandir}/man1/dbus-send.1%{?ext_man} +%{_mandir}/man1/dbus-test-tool.1%{?ext_man} +%{_mandir}/man1/dbus-update-activation-environment.1%{?ext_man} +%{_mandir}/man1/dbus-uuidgen.1%{?ext_man} +%{_mandir}/man1/dbus-launch.1%{?ext_man} %{_sbindir}/rcdbus # See doc/system-activation.txt in source tarball for the rationale # behind these permissions %attr(4750,root,messagebus) %verify(not mode) %{_libexecdir}/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 %{_libexecdir}/sysusers.d/dbus.conf %{_libexecdir}/tmpfiles.d/dbus.conf @@ -357,7 +335,6 @@ %{_bindir}/dbus-launch %files -n %{_libname} -%defattr(-, root, root) %{_libdir}/libdbus-1.so.* # Own those directories in the library instead of dbus-1, since dbus users # often ship files there @@ -371,7 +348,6 @@ %dir %{_datadir}/dbus-1/system-services %files devel -%defattr(-,root,root) %{_includedir}/* %{_libdir}/libdbus-1.so %dir %{_libdir}/dbus-1.0 @@ -381,7 +357,6 @@ %{_datadir}/xml/dbus-1 %files devel-doc -%defattr(-,root,root) %dir %{_datadir}/doc/dbus %dir %{_datadir}/doc/dbus/examples %{_datadir}/doc/dbus/api/
