diff --git a/glib-2.23.1.tar.bz2 b/glib-2.23.1.tar.bz2 deleted file mode 100644 index 3c64618..0000000 --- a/glib-2.23.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5074df427a0640fb37b73cb692f233907fa2015af3be8594cd235a28ed1605a6 -size 5082222 diff --git a/glib-2.23.2.tar.bz2 b/glib-2.23.2.tar.bz2 new file mode 100644 index 0000000..78bb667 --- /dev/null +++ b/glib-2.23.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:96396a496c7d31e24986275d58a59c9ceef2c57b49091813ad3f9e1a5de9c953 +size 5152834 diff --git a/glib2.changes b/glib2.changes index c41ca22..89a5be3 100644 --- a/glib2.changes +++ b/glib2.changes @@ -1,3 +1,62 @@ +------------------------------------------------------------------- +Thu Jan 28 00:25:50 CET 2010 - vuntz@opensuse.org + +- Correctly use gio-querymodules: + + package it in main package, with a giomodule.cache ghost file + + rename it gio-querymodules-64 on 64 bits platforms + + add Requires(post)/Requires(postun) to main package and + libgio-fam to make sure that gio-querymodules would work + + add post/postun scriptlets for main package and libgio-fam + +------------------------------------------------------------------- +Mon Jan 25 22:28:23 CET 2010 - captain.magnus@opensuse.org + +- Update to version 2.23.2: + + We are now using gcc builtins for atomic operations when + available + + g_assert() grew the ability to store assertions in core dumps + + GIO supports lazy loading of GIO modules, and there is a new + gio-querymodule utility that goes along with this. + + Threading changes: + - The requirements for g_thread_init() have been relaxed + slightly, it can be called multiple times, and does not have + to be the first call + - GObject now links to GThread and threads are enabled + automatically when g_type_init() is called + - Thread-safety issues with boxed types in GObject have been + fixed + + GObject: + - Another bunch of performance work has landed + + GVariant: + - GVariantType has been merged, with the rest of the GVariant + API to follow + + Bugs fixed: + - bgo#568760 - nautilus freezes due to a bug in garray.c:322 + - bgo#602417 - Document lifecycles of GSimpleAsyncResult and + friends + - bgo#604824 - crash in Epiphany: Selecting my Slashdot bo... + - bgo#448888 - don't init g_slice for always-malloc + - bgo#531902 - Use GCC atomic buildins for g_atomic* + - bgo#554887 - boxed type registration is not thread safe + - bgo#586150 - unresolved symbols when building glib 2.21.2 on + OS X Tiger + - bgo#589176 - row gvalue transform array exponentially + - bgo#594872 - Support storing assertion messages into core + dump + - bgo#602240 - Upgrade libasyncns to 0.8 + - bgo#603590 - Speed up G_VALUE_COLLECT + - bgo#604457 - gutf8inputstream.c: increasing unknown size + pointer + - bgo#605686 - GCharsetConverter doesn't flush + - bgo#605733 - g_memory_output_stream_new violates GObject + standards + - bgo#605883 - g_object_new() processes varargs even when there + are none + - bgo#605977 - invalid utf-8 conversion in + g_local_file_get_parse_name(... + - bgo#606775 - Enable threads by default in gobject + + Translation updates + ------------------------------------------------------------------- Tue Dec 22 13:16:55 CET 2009 - vuntz@opensuse.org diff --git a/glib2.spec b/glib2.spec index 05b7b43..de7c844 100644 --- a/glib2.spec +++ b/glib2.spec @@ -1,5 +1,5 @@ # -# spec file for package glib2 (Version 2.23.1) +# spec file for package glib2 (Version 2.23.2) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,7 +20,7 @@ Name: glib2 %define _name glib -Version: 2.23.1 +Version: 2.23.2 Release: 1 License: LGPLv2.1+ Summary: A Library with Convenient Functions Written in C @@ -57,6 +57,9 @@ 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 @@ -171,6 +174,9 @@ to a C programmer and is used by Gtk+ and GNOME. License: LGPLv2.1+ Summary: A Library with Convenient Functions Written in C Group: Development/Libraries/C and C++ +# we need gio-querymodules in %post/%postun +Requires(post): %{name} +Requires(postun): %{name} Supplements: packageand(libgio-2_0-0:fam) %description -n libgio-fam @@ -243,10 +249,19 @@ install -D -m0644 glib2.sh $RPM_BUILD_ROOT/etc/profile.d/zzz-glib2.sh install -D -m0644 glib2.csh $RPM_BUILD_ROOT/etc/profile.d/zzz-glib2.csh install -D -m0755 SuSEconfig.glib2 $RPM_BUILD_ROOT/sbin/conf.d/SuSEconfig.glib2 install -D -m0644 gnome_defaults.conf $RPM_BUILD_ROOT%{_sysconfdir}/gnome_defaults.conf +# default apps magic mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/cache/gio-2.0 $RPM_BUILD_ROOT%{_datadir}/applications touch $RPM_BUILD_ROOT%{_localstatedir}/cache/gio-2.0/defaults.list ln -s %{_localstatedir}/cache/gio-2.0/defaults.list $RPM_BUILD_ROOT%{_datadir}/applications/defaults.list +# fix some permission issue, but only if needed +test ! -x $RPM_BUILD_ROOT/%{_bindir}/gtester-report chmod +x $RPM_BUILD_ROOT/%{_bindir}/gtester-report +# gio-querymodules magic +%if "%{_lib}" == "lib64" +mv $RPM_BUILD_ROOT%{_bindir}/gio-querymodules $RPM_BUILD_ROOT%{_bindir}/gio-querymodules-64 +%endif +touch $RPM_BUILD_ROOT%{_libdir}/gio/modules/giomodule.cache +# remove files we don't care about rm $RPM_BUILD_ROOT%{_libdir}/gio/modules/libgiofam.*a # We do not need the la files for 11.1 and newer %if %suse_version > 1100 @@ -269,6 +284,13 @@ if test -f etc/gnome_defaults.conf.rpmsave ; then mv etc/gnome_defaults.conf.rpmsave etc/gnome_defaults.conf fi +%post +%if "%{_lib}" == "lib64" + %{_bindir}/gio-querymodules-64 %{_libdir}/gio/modules +%else + %{_bindir}/gio-querymodules %{_libdir}/gio/modules +%endif + %post -n libglib-2_0-0 -p /sbin/ldconfig %post -n libgobject-2_0-0 -p /sbin/ldconfig @@ -279,6 +301,20 @@ fi %post -n libgmodule-2_0-0 -p /sbin/ldconfig +%post -n libgio-fam +%if "%{_lib}" == "lib64" + %{_bindir}/gio-querymodules-64 %{_libdir}/gio/modules +%else + %{_bindir}/gio-querymodules %{_libdir}/gio/modules +%endif + +%postun +%if "%{_lib}" == "lib64" + %{_bindir}/gio-querymodules-64 %{_libdir}/gio/modules +%else + %{_bindir}/gio-querymodules %{_libdir}/gio/modules +%endif + %postun -n libglib-2_0-0 -p /sbin/ldconfig %postun -n libgobject-2_0-0 -p /sbin/ldconfig @@ -289,6 +325,13 @@ fi %postun -n libgmodule-2_0-0 -p /sbin/ldconfig +%postun -n libgio-fam +%if "%{_lib}" == "lib64" + %{_bindir}/gio-querymodules-64 %{_libdir}/gio/modules +%else + %{_bindir}/gio-querymodules %{_libdir}/gio/modules +%endif + %clean rm -rf $RPM_BUILD_ROOT @@ -298,8 +341,10 @@ rm -rf $RPM_BUILD_ROOT %{_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) @@ -335,7 +380,12 @@ rm -rf $RPM_BUILD_ROOT %files devel %defattr(-,root,root) -%{_bindir}/* +%{_bindir}/glib-* +%{_bindir}/gobject-* +%{_bindir}/gtester* +%doc %{_mandir}/man?/glib-*.* +%doc %{_mandir}/man?/gobject-*.* +%doc %{_mandir}/man?/gtester*.* %{_datadir}/aclocal/*.m4 %{_datadir}/glib-2.0 %{_includedir}/glib-2.0 @@ -344,7 +394,6 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/lib*.*a %{_libdir}/glib-2.0 %{_libdir}/pkgconfig/*.pc -%doc %{_mandir}/man*/* %{_datadir}/gtk-doc/html/gio %{_datadir}/gtk-doc/html/glib %{_datadir}/gtk-doc/html/gobject