Hello community,
here is the log from the commit of package dbus-1 for openSUSE:Factory checked
in at 2017-07-30 11:22:03
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/dbus-1 (Old)
and /work/SRC/openSUSE:Factory/.dbus-1.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dbus-1"
Sun Jul 30 11:22:03 2017 rev:148 rq:510425 version:1.10.20
Changes:
--------
--- /work/SRC/openSUSE:Factory/dbus-1/dbus-1-x11.changes 2017-07-04
11:54:22.503306475 +0200
+++ /work/SRC/openSUSE:Factory/.dbus-1.new/dbus-1-x11.changes 2017-07-30
11:22:03.494451386 +0200
@@ -1,0 +2,9 @@
+Fri Jul 7 07:51:56 UTC 2017 - sfl...@suse.de
+
+- No need to set --libdir anymore now that prefix is /usr/bin,
+ * fixes boo#1047532
+- No need to set --bindir, bindir in dbus-1-x11 was incorrect
+- Other fixes required to properly change prefix
+- Don't pass --with-initscripts we don't use them anymore.
+
+-------------------------------------------------------------------
dbus-1.changes: same change
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ dbus-1-x11.spec ++++++
--- /var/tmp/diff_new_pack.x0068S/_old 2017-07-30 11:22:04.658287220 +0200
+++ /var/tmp/diff_new_pack.x0068S/_new 2017-07-30 11:22:04.666286091 +0200
@@ -75,10 +75,7 @@
# is_opensuse was first defined after openSUSE 13.2
%configure \
--disable-static \
- --bindir=/bin \
--libexecdir=/lib/dbus-1 \
- --libdir=/%{_lib} \
- --with-init-scripts=suse \
--enable-inotify \
--disable-doxygen-docs \
%if %{with selinux}
@@ -105,7 +102,7 @@
tdir=$(mktemp -d)
make DESTDIR=$tdir install
mkdir -p %{buildroot}/%{_bindir}
-mv $tdir/bin/dbus-launch %{buildroot}/%{_bindir}/dbus-launch.x11
+mv $tdir/%{_bindir}/dbus-launch %{buildroot}/%{_bindir}/dbus-launch.x11
mkdir -p %{buildroot}%{_sysconfdir}/alternatives
ln -s -f %{_sysconfdir}/alternatives/dbus-launch
%{buildroot}%{_bindir}/dbus-launch
++++++ dbus-1.spec ++++++
--- /var/tmp/diff_new_pack.x0068S/_old 2017-07-30 11:22:04.750274239 +0200
+++ /var/tmp/diff_new_pack.x0068S/_new 2017-07-30 11:22:04.758273110 +0200
@@ -49,7 +49,7 @@
BuildRequires: libexpat-devel
BuildRequires: libtool
BuildRequires: permissions
-BuildRequires: pkgconfig
+BuildRequires: pkg-config
BuildRequires: update-desktop-files
BuildRequires: xmlto
BuildRequires: pkgconfig(libsystemd) >= 209
@@ -129,10 +129,7 @@
# is_opensuse was first defined after openSUSE 13.2
%configure \
--disable-static \
- --bindir=/%{_bindir} \
--libexecdir=/lib/dbus-1 \
- --libdir=/%{_lib} \
- --with-init-scripts=suse \
--enable-inotify \
--enable-doxygen-docs \
%if %{with selinux}
@@ -161,14 +158,6 @@
%install
%make_install
-# devel stuff must not be in /lib
-mkdir -p %{buildroot}/%{_libdir}/dbus-1.0/include/
-mv -f %{buildroot}/%{_lib}/dbus-1.0/include/*
%{buildroot}/%{_libdir}/dbus-1.0/include/
-find %{buildroot} -type f -name "*.la" -delete -print
-ln -s -v /%{_lib}/$(readlink %{buildroot}/%{_lib}/lib%{name}.so)
%{buildroot}%{_libdir}/lib%{name}.so
-rm -v %{buildroot}/%{_lib}/lib%{name}.so
-
-mkdir -p %{buildroot}%{_libdir}/dbus-1.0/include/
mkdir -p %{buildroot}/lib/dbus-1/system-services
# dbus-launch, too
mv -f %{buildroot}/%{_bindir}/dbus-launch
%{buildroot}%{_bindir}/dbus-launch.nox11
@@ -186,11 +175,6 @@
mkdir -p %{buildroot}/lib/dbus-1/system-services
mkdir -p %{buildroot}/%{_datadir}/dbus-1/interfaces
-# fix up pkgconfig file
-mkdir -p %{buildroot}/%{_libdir}/pkgconfig
-sed -e 's@^\(libdir=\).*@\1%{_libdir}@'
%{buildroot}/%{_lib}/pkgconfig/dbus-1.pc >
%{buildroot}/%{_libdir}/pkgconfig/dbus-1.pc
-rm -f %{buildroot}/%{_lib}/pkgconfig/dbus-1.pc
-
for i in %{_sysconfdir}/dbus-1/session.d %{_sysconfdir}/dbus-1/system.d \
%{_datadir}/dbus-1/interfaces %{_datadir}/dbus-1/services
%{_datadir}/dbus-1/system-services; do
mkdir -p %{buildroot}$i
@@ -363,7 +347,7 @@
%files -n %{_libname}
%defattr(-, root, root)
-/%{_lib}/libdbus-1.so.*
+%{_libdir}/libdbus-1.so.*
# Own those directories in the library instead of dbus-1, since dbus users
# often ship files there
%dir %{_sysconfdir}/dbus-1
