Hello community, here is the log from the commit of package dbus-1 checked in at Tue Jun 3 16:10:05 CEST 2008. -------- --- dbus-1/dbus-1.changes 2008-05-07 14:56:07.000000000 +0200 +++ /mounts/work_src_done/STABLE/dbus-1/dbus-1.changes 2008-06-02 18:24:27.526324000 +0200 @@ -1,0 +2,5 @@ +Mon Jun 2 18:22:15 CEST 2008 - thoenig@suse.de + +- add patch dbus-userdb-typo.patch (bnc#394383) + +------------------------------------------------------------------- dbus-1-x11.changes: same change New: ---- dbus-userdb-typo.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dbus-1.spec ++++++ --- /var/tmp/diff_new_pack.p12853/_old 2008-06-03 16:09:37.000000000 +0200 +++ /var/tmp/diff_new_pack.p12853/_new 2008-06-03 16:09:37.000000000 +0200 @@ -19,13 +19,14 @@ # COMMON1-BEGIN BuildRequires: doxygen libexpat-devel libzio pkgconfig Version: 1.2.1 -Release: 8 +Release: 14 AutoReqProv: on Source0: dbus-%{version}.tar.bz2 Source1: rc.boot.dbus Source2: dbus-1.desktop Patch0: dbus-do-not-abort-on-check-thoenig-01.patch Patch1: dbus-fix-timer-leak-dmueller-01.patch +Patch2: dbus-userdb-typo.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # COMMON1-END PreReq: permissions /usr/sbin/groupadd /usr/sbin/useradd /sbin/insserv /etc/init.d/boot.localfs @@ -131,6 +132,7 @@ # Disable this until we hit RC phase #%patch0 %patch1 +%patch2 -p1 %build autoreconf -fi @@ -254,6 +256,8 @@ %{_datadir}/susehelp %changelog +* Mon Jun 02 2008 thoenig@suse.de +- add patch dbus-userdb-typo.patch (bnc#394383) * Wed May 07 2008 thoenig@suse.de - add patch dbus-fix-timer-leak-dmueller-01.patch (bnc#381621) * Thu Apr 24 2008 thoenig@suse.de ++++++ dbus-1-x11.spec ++++++ --- /var/tmp/diff_new_pack.p12853/_old 2008-06-03 16:09:37.000000000 +0200 +++ /var/tmp/diff_new_pack.p12853/_new 2008-06-03 16:09:37.000000000 +0200 @@ -21,13 +21,14 @@ # COMMON1-BEGIN BuildRequires: doxygen libexpat-devel libzio pkgconfig Version: 1.2.1 -Release: 10 +Release: 16 AutoReqProv: on Source0: dbus-%{version}.tar.bz2 Source1: rc.boot.dbus Source2: dbus-1.desktop Patch0: dbus-do-not-abort-on-check-thoenig-01.patch Patch1: dbus-fix-timer-leak-dmueller-01.patch +Patch2: dbus-userdb-typo.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # COMMON1-END # COMMON1-END @@ -62,6 +63,7 @@ # Disable this until we hit RC phase #%patch0 %patch1 +%patch2 -p1 %build autoreconf -fi @@ -109,6 +111,8 @@ %{_mandir}/man1/dbus-launch.1* %changelog +* Mon Jun 02 2008 thoenig@suse.de +- add patch dbus-userdb-typo.patch (bnc#394383) * Wed May 07 2008 thoenig@suse.de - add patch dbus-fix-timer-leak-dmueller-01.patch (bnc#381621) * Thu Apr 24 2008 thoenig@suse.de ++++++ dbus-userdb-typo.patch ++++++ diff --git a/dbus/dbus-userdb-util.c b/dbus/dbus-userdb-util.c index 30d5083..d03a7c7 100644 --- a/dbus/dbus-userdb-util.c +++ b/dbus/dbus-userdb-util.c @@ -223,7 +223,7 @@ _dbus_user_database_lookup_group (DBusUserDatabase *db, gid = n; } -#ifdef DBUS_ENABLE_USER_CACHE +#ifdef DBUS_ENABLE_USERDB_CACHE if (gid != DBUS_GID_UNSET) info = _dbus_hash_table_lookup_ulong (db->groups, gid); else diff --git a/dbus/dbus-userdb.c b/dbus/dbus-userdb.c index 0e430b2..03d263f 100644 --- a/dbus/dbus-userdb.c +++ b/dbus/dbus-userdb.c @@ -143,7 +143,7 @@ _dbus_user_database_lookup (DBusUserDatabase *db, uid = n; } -#ifdef DBUS_ENABLE_USER_CACHE +#ifdef DBUS_ENABLE_USERDB_CACHE if (uid != DBUS_UID_UNSET) info = _dbus_hash_table_lookup_ulong (db->users, uid); else ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org