Hello community, here is the log from the commit of package glib2 for openSUSE:Factory checked in at Fri Jun 4 14:50:08 CEST 2010. -------- --- GNOME/glib2/glib2.changes 2010-05-03 22:29:08.000000000 +0200 +++ /mounts/work_src_done/STABLE/glib2/glib2.changes 2010-06-03 19:16:13.000000000 +0200 @@ -1,0 +2,18 @@ +Thu Jun 3 19:11:32 CEST 2010 - vuntz@opensuse.org + +- Break a requirement cycle between glib2 and libgio-2_0-0, to fix + bnc#595702: + + remove libgio-2_0-0 Requires(post)/Requires(postun) from main + package + + remove glib2 Requires from libglib-2_0-0, libgmodule-2_0-0, + libgio-2_0-0, libgthread-2_0-0, libgobject-2_0-0. + + add a Recommends for glib2-lang in libglib-2_0-0 to make the + translations installed by default. +- Move some gio files from glib2 to libgio-2_0-0. Unfortunately, it + means we get unversioned files in a subpackage for a versioned + library, but that's what we really need: /usr/lib/gio belongs + there and we have a symlink pointing to + /usr/share/applications/defaults.list (so we don't want a + dangling symlink). + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ glib2.spec ++++++ --- /var/tmp/diff_new_pack.uFJ9xi/_old 2010-06-04 14:49:50.000000000 +0200 +++ /var/tmp/diff_new_pack.uFJ9xi/_new 2010-06-04 14:49:50.000000000 +0200 @@ -21,7 +21,7 @@ Name: glib2 %define _name glib Version: 2.24.1 -Release: 1 +Release: 2 License: LGPLv2.1+ Summary: A Library with Convenient Functions Written in C Url: http://www.gtk.org/ @@ -52,14 +52,11 @@ %if %suse_version > 1100 BuildRequires: libselinux-devel %endif -# For temporary %%pre script only. +# For temporary %%posttrans script only. PreReq: coreutils PreReq: /bin/sed Requires: %{name}-branding Requires: %{name}-lang = %{version} -# we need gio-querymodules to work in %post/%postun -Requires(post): libgio-2_0-0 -Requires(postun): libgio-2_0-0 # Conflicts with gnome_defaults.conf from gnome-vfs2 in 10.3 Conflicts: gnome-vfs2 < 2.22.0 # bug437293 @@ -127,7 +124,7 @@ License: LGPLv2.1+ Summary: A Library with Convenient Functions Written in C Group: Development/Libraries/C and C++ -Requires: %{name} = %{version} +Recommends: %{name}-lang = %{version} # bug437293 %ifarch ppc64 Obsoletes: glib2-64bit @@ -142,7 +139,6 @@ License: LGPLv2.1+ Summary: A Library with Convenient Functions Written in C Group: Development/Libraries/C and C++ -Requires: %{name} = %{version} # bug437293 %ifarch ppc64 Obsoletes: glib2-64bit @@ -157,7 +153,6 @@ License: LGPLv2.1+ Summary: A Library with Convenient Functions Written in C Group: Development/Libraries/C and C++ -Requires: %{name} = %{version} # bug437293 %ifarch ppc64 Obsoletes: glib2-64bit @@ -202,7 +197,6 @@ License: LGPLv2.1+ Summary: A Library with Convenient Functions Written in C Group: Development/Libraries/C and C++ -Requires: %{name} = %{version} # bug437293 %ifarch ppc64 Obsoletes: glib2-64bit @@ -334,13 +328,9 @@ %files %defattr(-,root,root) %doc AUTHORS COPYING README NEWS ChangeLog -%{_datadir}/applications/defaults.list /etc/profile.d/zzz-glib2.* /sbin/conf.d/SuSEconfig.glib2 %{_bindir}/gio-querymodules* -%dir %{_libdir}/gio -%dir %{_libdir}/gio/modules -%ghost %{_libdir}/gio/modules/giomodule.cache %files branding-upstream %defattr(-,root,root) @@ -365,6 +355,10 @@ %files -n libgio-2_0-0 %defattr(-, root, root) %{_libdir}/libgio*.so.* +%dir %{_libdir}/gio +%dir %{_libdir}/gio/modules +%ghost %{_libdir}/gio/modules/giomodule.cache +%{_datadir}/applications/defaults.list %dir %{_localstatedir}/cache/gio-2.0 %ghost %{_localstatedir}/cache/gio-2.0/defaults.list ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org