Hello community, here is the log from the commit of package dbus-1 checked in at Fri Sep 5 20:16:26 CEST 2008. -------- --- dbus-1/dbus-1.changes 2008-08-25 12:01:05.000000000 +0200 +++ dbus-1/dbus-1.changes 2008-09-03 12:09:57.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Sep 3 12:09:25 CEST 2008 - lnussel@suse.de + +- hook into ConsoleKit for at_console support +- only require selinux for > 11.0 + +------------------------------------------------------------------- dbus-1-x11.changes: same change New: ---- dbus_at_console.ck ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dbus-1.spec ++++++ --- /var/tmp/diff_new_pack.xZ3279/_old 2008-09-05 20:16:00.000000000 +0200 +++ /var/tmp/diff_new_pack.xZ3279/_new 2008-09-05 20:16:00.000000000 +0200 @@ -17,6 +17,11 @@ # norootforbuild +%if 0%{?suse_version} > 1100 +%bcond_without selinux +%else +%bcond_with selinux +%endif Name: dbus-1 Url: http://dbus.freedesktop.org/ @@ -25,13 +30,17 @@ Summary: D-Bus Message Bus System # COMMON1-BEGIN BuildRequires: doxygen libexpat-devel libzio pkgconfig -BuildRequires: audit-devel libselinux-devel +BuildRequires: audit-devel +%if %{with selinux} +BuildRequires: libselinux-devel +%endif Version: 1.2.3 -Release: 6 +Release: 9 AutoReqProv: on Source0: dbus-%{version}.tar.bz2 Source1: rc.boot.dbus Source2: dbus-1.desktop +Source3: dbus_at_console.ck Patch0: dbus-do-not-abort-on-check-thoenig-01.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # COMMON1-END @@ -159,8 +168,11 @@ --with-init-scripts=suse \ --enable-inotify \ --enable-doxygen-docs \ - --enable-selinux --enable-libaudit \ - --with-console-auth-dir=/var/run/resmgr/classes/desktop/ +%if %{with selinux} + --enable-selinux \ +%endif + --enable-libaudit \ + --with-console-auth-dir=/var/run/dbus/at_console/ make %{?jobs:-j %jobs} doxygen -u && doxygen ./cleanup-man-pages.sh @@ -188,6 +200,9 @@ rm -f %{buildroot}/bin/dbus-launch rm -f %{buildroot}/%{_mandir}/man1/dbus-launch.1* chmod a-x AUTHORS COPYING HACKING NEWS README doc/*.txt doc/file-boilerplate.c doc/TODO +# +install -d %{buildroot}%{_sysconfdir}/ConsoleKit/run-session.d +install -m 755 %{SOURCE3} %{buildroot}%{_sysconfdir}/ConsoleKit/run-session.d %clean %{__rm} -rf %{buildroot} @@ -227,6 +242,7 @@ %doc AUTHORS COPYING HACKING NEWS README %{_sysconfdir}/dbus-1 %{_sysconfdir}/init.d/dbus +%{_sysconfdir}/ConsoleKit /bin/dbus-cleanup-sockets /bin/dbus-daemon /bin/dbus-monitor @@ -261,6 +277,9 @@ %{_datadir}/susehelp %changelog +* Wed Sep 03 2008 lnussel@suse.de +- hook into ConsoleKit for at_console support +- only require selinux for > 11.0 * Mon Aug 25 2008 prusnak@suse.cz - enabled SELinux support [Fate#303662] * Fri Aug 22 2008 aj@suse.de ++++++ dbus-1-x11.spec ++++++ --- /var/tmp/diff_new_pack.xZ3279/_old 2008-09-05 20:16:00.000000000 +0200 +++ /var/tmp/diff_new_pack.xZ3279/_new 2008-09-05 20:16:00.000000000 +0200 @@ -17,6 +17,11 @@ # norootforbuild +%if 0%{?suse_version} > 1100 +%bcond_without selinux +%else +%bcond_with selinux +%endif Name: dbus-1-x11 BuildRequires: xorg-x11-devel @@ -27,13 +32,17 @@ # COMMON1-BEGIN # COMMON1-BEGIN BuildRequires: doxygen libexpat-devel libzio pkgconfig -BuildRequires: audit-devel libselinux-devel +BuildRequires: audit-devel +%if %{with selinux} +BuildRequires: libselinux-devel +%endif Version: 1.2.3 -Release: 11 +Release: 16 AutoReqProv: on Source0: dbus-%{version}.tar.bz2 Source1: rc.boot.dbus Source2: dbus-1.desktop +Source3: dbus_at_console.ck Patch0: dbus-do-not-abort-on-check-thoenig-01.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # COMMON1-END @@ -90,8 +99,11 @@ --with-init-scripts=suse \ --enable-inotify \ --enable-doxygen-docs \ - --enable-selinux --enable-libaudit \ - --with-console-auth-dir=/var/run/resmgr/classes/desktop/ +%if %{with selinux} + --enable-selinux \ +%endif + --enable-libaudit \ + --with-console-auth-dir=/var/run/dbus/at_console/ make %{?jobs:-j %jobs} doxygen -u && doxygen ./cleanup-man-pages.sh @@ -116,6 +128,9 @@ %{_mandir}/man1/dbus-launch.1* %changelog +* Wed Sep 03 2008 lnussel@suse.de +- hook into ConsoleKit for at_console support +- only require selinux for > 11.0 * Mon Aug 25 2008 prusnak@suse.cz - enabled SELinux support [Fate#303662] * Fri Aug 22 2008 aj@suse.de ++++++ dbus-1-x11.spec.in ++++++ --- dbus-1/dbus-1-x11.spec.in 2008-08-07 14:28:54.000000000 +0200 +++ dbus-1/dbus-1-x11.spec.in 2008-09-03 14:11:10.000000000 +0200 @@ -10,6 +10,12 @@ # norootforbuild +%if 0%{?suse_version} > 1100 +%bcond_without selinux +%else +%bcond_with selinux +%endif + Name: dbus-1-x11 BuildRequires: xorg-x11-devel URL: http://dbus.freedesktop.org/ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org