Accepting request 509331 from home:simotek:branches:Base:System

- 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.

OBS-URL: https://build.opensuse.org/request/show/509331
OBS-URL: https://build.opensuse.org/package/show/Base:System/dbus-1?expand=0&rev=255

dbus-1-x11.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Fri Jul  7 07:51:56 UTC 2017 - sflees@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.
+
 -------------------------------------------------------------------
 Fri Jun 30 02:27:21 UTC 2017 - sflees@suse.de
 

dbus-1-x11.spec

@@ -75,10 +75,7 @@ export V=1
 # 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 @@ make %{?_smp_mflags}
 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.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Fri Jul  7 07:51:56 UTC 2017 - sflees@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.
+
 -------------------------------------------------------------------
 Fri Jun 30 02:27:21 UTC 2017 - sflees@suse.de
 

dbus-1.spec

@@ -49,7 +49,7 @@ BuildRequires:  libcap-ng-devel
 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 @@ export V=1
 # 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 @@ doxygen -u && doxygen
 %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}/%{_libdir}/pkgconfig
 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 @@ fi
 
 %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