From 61bae6b120f09773f0ee1aedf0c1ece6568a3a57259d0207c6ed930d8a4d62df Mon Sep 17 00:00:00 2001
From: Vincent Untz <vuntz@opensuse.org>
Date: Thu, 28 Jan 2010 00:01:06 +0000
Subject: [PATCH 1/4] Accepting request 30656 from
 home:vuntz:branches:GNOME:Factory

Copy from home:vuntz:branches:GNOME:Factory/glib2 via accept of submit request 30656 revision 2.
Request was accepted with message:
ok

OBS-URL: https://build.opensuse.org/request/show/30656
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/glib2?expand=0&rev=68
---
 glib-2.23.1.tar.bz2 |  3 ---
 glib-2.23.2.tar.bz2 |  3 +++
 glib2.changes       | 59 +++++++++++++++++++++++++++++++++++++++++++++
 glib2.spec          | 57 ++++++++++++++++++++++++++++++++++++++++---
 4 files changed, 115 insertions(+), 7 deletions(-)
 delete mode 100644 glib-2.23.1.tar.bz2
 create mode 100644 glib-2.23.2.tar.bz2

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

From 92458ac0503f16580c334996a3c2c773558392126389c6043f8376d8c6d38446 Mon Sep 17 00:00:00 2001
From: Vincent Untz <vuntz@opensuse.org>
Date: Thu, 11 Feb 2010 00:33:36 +0000
Subject: [PATCH 2/4] Accepting request 32063 from
 home:vuntz:branches:GNOME:Factory

Copy from home:vuntz:branches:GNOME:Factory/glib2 via accept of submit request 32063 revision 2.
Request was accepted with message:
ok

OBS-URL: https://build.opensuse.org/request/show/32063
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/glib2?expand=0&rev=69
---
 glib-2.23.2.tar.bz2 |  3 ---
 glib-2.23.3.tar.bz2 |  3 +++
 glib2.changes       | 20 ++++++++++++++++++++
 glib2.spec          |  4 ++--
 4 files changed, 25 insertions(+), 5 deletions(-)
 delete mode 100644 glib-2.23.2.tar.bz2
 create mode 100644 glib-2.23.3.tar.bz2

diff --git a/glib-2.23.2.tar.bz2 b/glib-2.23.2.tar.bz2
deleted file mode 100644
index 78bb667..0000000
--- a/glib-2.23.2.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:96396a496c7d31e24986275d58a59c9ceef2c57b49091813ad3f9e1a5de9c953
-size 5152834
diff --git a/glib-2.23.3.tar.bz2 b/glib-2.23.3.tar.bz2
new file mode 100644
index 0000000..fba762c
--- /dev/null
+++ b/glib-2.23.3.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9d6433c60b3cebcf3e05ea2c65cde0817d110d41e1abb7873113cfd7efe18fac
+size 5245920
diff --git a/glib2.changes b/glib2.changes
index 89a5be3..b477600 100644
--- a/glib2.changes
+++ b/glib2.changes
@@ -1,3 +1,23 @@
+-------------------------------------------------------------------
+Wed Feb 10 16:01:41 CET 2010 - vuntz@opensuse.org
+
+- Update to version 2.23.3:
+  + GLib now has a facility for locks that consume only one bit of
+    storage inside an integer: g_bit_lock()
+  + GVariant:
+    - The serializer has been merged, with more API to follow
+  + Bugs fixed
+    - bgo#548967: 1 bit mutex lock
+    - bgo#604967: 2.22.3 libasyncns build fails on HP-UX 11.11
+    - bgo#608602: G_VALUE_COLLECT_INIT variables shadow those in
+                  G_VALUE_COLLECT
+    - bgo#608743: Crash in g_hostname_to_ascii visiting certain
+                  website in epiphany
+    - bgo#599197: array ref and unref functions crash on NULL
+                  array.
+    - bgo#608159: mem leak in g_io_modules_scan_all_in_directory
+  + Updated translations.
+
 -------------------------------------------------------------------
 Thu Jan 28 00:25:50 CET 2010 - vuntz@opensuse.org
 
diff --git a/glib2.spec b/glib2.spec
index de7c844..8532349 100644
--- a/glib2.spec
+++ b/glib2.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package glib2 (Version 2.23.2)
+# spec file for package glib2 (Version 2.23.3)
 #
 # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -20,7 +20,7 @@
 
 Name:           glib2
 %define _name glib
-Version:        2.23.2
+Version:        2.23.3
 Release:        1
 License:        LGPLv2.1+
 Summary:        A Library with Convenient Functions Written in C

From 9c9d6d36d2cb355df7c144005fe02f1757088ce35a6d3fe75073348cbb28ab79 Mon Sep 17 00:00:00 2001
From: OBS User autobuild <null@suse.de>
Date: Thu, 11 Feb 2010 18:05:04 +0000
Subject: [PATCH 3/4] checked in (request 32253)

OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/glib2?expand=0&rev=70
---
 glib-2.23.1.tar.bz2 |  3 ++
 glib-2.23.3.tar.bz2 |  3 --
 glib2.changes       | 79 ---------------------------------------------
 glib2.spec          | 57 +++-----------------------------
 4 files changed, 7 insertions(+), 135 deletions(-)
 create mode 100644 glib-2.23.1.tar.bz2
 delete mode 100644 glib-2.23.3.tar.bz2

diff --git a/glib-2.23.1.tar.bz2 b/glib-2.23.1.tar.bz2
new file mode 100644
index 0000000..3c64618
--- /dev/null
+++ b/glib-2.23.1.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5074df427a0640fb37b73cb692f233907fa2015af3be8594cd235a28ed1605a6
+size 5082222
diff --git a/glib-2.23.3.tar.bz2 b/glib-2.23.3.tar.bz2
deleted file mode 100644
index fba762c..0000000
--- a/glib-2.23.3.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9d6433c60b3cebcf3e05ea2c65cde0817d110d41e1abb7873113cfd7efe18fac
-size 5245920
diff --git a/glib2.changes b/glib2.changes
index b477600..c41ca22 100644
--- a/glib2.changes
+++ b/glib2.changes
@@ -1,82 +1,3 @@
--------------------------------------------------------------------
-Wed Feb 10 16:01:41 CET 2010 - vuntz@opensuse.org
-
-- Update to version 2.23.3:
-  + GLib now has a facility for locks that consume only one bit of
-    storage inside an integer: g_bit_lock()
-  + GVariant:
-    - The serializer has been merged, with more API to follow
-  + Bugs fixed
-    - bgo#548967: 1 bit mutex lock
-    - bgo#604967: 2.22.3 libasyncns build fails on HP-UX 11.11
-    - bgo#608602: G_VALUE_COLLECT_INIT variables shadow those in
-                  G_VALUE_COLLECT
-    - bgo#608743: Crash in g_hostname_to_ascii visiting certain
-                  website in epiphany
-    - bgo#599197: array ref and unref functions crash on NULL
-                  array.
-    - bgo#608159: mem leak in g_io_modules_scan_all_in_directory
-  + Updated translations.
-
--------------------------------------------------------------------
-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 8532349..05b7b43 100644
--- a/glib2.spec
+++ b/glib2.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package glib2 (Version 2.23.3)
+# spec file for package glib2 (Version 2.23.1)
 #
 # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -20,7 +20,7 @@
 
 Name:           glib2
 %define _name glib
-Version:        2.23.3
+Version:        2.23.1
 Release:        1
 License:        LGPLv2.1+
 Summary:        A Library with Convenient Functions Written in C
@@ -57,9 +57,6 @@ 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
@@ -174,9 +171,6 @@ 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
@@ -249,19 +243,10 @@ 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
@@ -284,13 +269,6 @@ 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
@@ -301,20 +279,6 @@ 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
@@ -325,13 +289,6 @@ 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
 
@@ -341,10 +298,8 @@ 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)
@@ -380,12 +335,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(-,root,root)
-%{_bindir}/glib-*
-%{_bindir}/gobject-*
-%{_bindir}/gtester*
-%doc %{_mandir}/man?/glib-*.*
-%doc %{_mandir}/man?/gobject-*.*
-%doc %{_mandir}/man?/gtester*.*
+%{_bindir}/*
 %{_datadir}/aclocal/*.m4
 %{_datadir}/glib-2.0
 %{_includedir}/glib-2.0
@@ -394,6 +344,7 @@ 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

From 3de1af398847af354209635a160f69bb0526b0a9ae2f80fc8d0b48930efd60d9 Mon Sep 17 00:00:00 2001
From: OBS User buildservice-autocommit <null@suse.de>
Date: Thu, 11 Feb 2010 18:05:05 +0000
Subject: [PATCH 4/4] Updating link to change in openSUSE:Factory/glib2
 revision 78.0

OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/glib2?expand=0&rev=f3e22d48ea1f5d45475dcb3aa3a978e7
---
 glib-2.23.1.tar.bz2 |  3 --
 glib-2.23.3.tar.bz2 |  3 ++
 glib2.changes       | 79 +++++++++++++++++++++++++++++++++++++++++++++
 glib2.spec          | 59 ++++++++++++++++++++++++++++++---
 4 files changed, 136 insertions(+), 8 deletions(-)
 delete mode 100644 glib-2.23.1.tar.bz2
 create mode 100644 glib-2.23.3.tar.bz2

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.3.tar.bz2 b/glib-2.23.3.tar.bz2
new file mode 100644
index 0000000..fba762c
--- /dev/null
+++ b/glib-2.23.3.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9d6433c60b3cebcf3e05ea2c65cde0817d110d41e1abb7873113cfd7efe18fac
+size 5245920
diff --git a/glib2.changes b/glib2.changes
index c41ca22..b477600 100644
--- a/glib2.changes
+++ b/glib2.changes
@@ -1,3 +1,82 @@
+-------------------------------------------------------------------
+Wed Feb 10 16:01:41 CET 2010 - vuntz@opensuse.org
+
+- Update to version 2.23.3:
+  + GLib now has a facility for locks that consume only one bit of
+    storage inside an integer: g_bit_lock()
+  + GVariant:
+    - The serializer has been merged, with more API to follow
+  + Bugs fixed
+    - bgo#548967: 1 bit mutex lock
+    - bgo#604967: 2.22.3 libasyncns build fails on HP-UX 11.11
+    - bgo#608602: G_VALUE_COLLECT_INIT variables shadow those in
+                  G_VALUE_COLLECT
+    - bgo#608743: Crash in g_hostname_to_ascii visiting certain
+                  website in epiphany
+    - bgo#599197: array ref and unref functions crash on NULL
+                  array.
+    - bgo#608159: mem leak in g_io_modules_scan_all_in_directory
+  + Updated translations.
+
+-------------------------------------------------------------------
+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..40b3d71 100644
--- a/glib2.spec
+++ b/glib2.spec
@@ -1,7 +1,7 @@
 #
-# spec file for package glib2 (Version 2.23.1)
+# spec file for package glib2 (Version 2.23.3)
 #
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -20,7 +20,7 @@
 
 Name:           glib2
 %define _name glib
-Version:        2.23.1
+Version:        2.23.3
 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