Hello community,
here is the log from the commit of package glib2
checked in at Sun Apr 20 14:47:05 CEST 2008.
--------
--- GNOME/glib2/glib2.changes 2008-04-12 00:06:03.000000000 +0200
+++ glib2/glib2.changes 2008-04-14 23:50:42.977264000 +0200
@@ -1,0 +2,11 @@
+Mon Apr 14 23:54:54 CEST 2008 - maw@suse.de
+
+- Add glib2-fix-bookmark-leak.diff.
+
+-------------------------------------------------------------------
+Mon Apr 14 19:16:16 CEST 2008 - sbrabec@suse.cz
+
+- Use packageand form of branding supplement and removed self
+ conflict.
+
+-------------------------------------------------------------------
New:
----
glib2-fix-bookmark-leak.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ glib2.spec ++++++
--- /var/tmp/diff_new_pack.c12539/_old 2008-04-20 14:45:29.000000000 +0200
+++ /var/tmp/diff_new_pack.c12539/_new 2008-04-20 14:45:29.000000000 +0200
@@ -18,7 +18,7 @@
Group: Development/Libraries/C and C++
AutoReqProv: on
Version: 2.16.3
-Release: 2
+Release: 4
Summary: A Library with Convenient Functions Written in C
Url: http://www.gtk.org/
Source: ftp://ftp.gnome.org/pub/GNOME/sources/%{_name}/2.14/%{_name}-%{version}.tar.bz2
@@ -34,16 +34,18 @@
Patch0: glib2-mkinstalldirs.patch
# PATCH-FIX-OPENSUSE glib2-aclocal.patch
Patch1: glib2-aclocal.patch
-# PATCH-FIX-NEEDS-REBASE glib2-cast.patch
+# PATCH-FIX-NEEDS-REBASE glib2-cast.patch -- This patch doesn't necessarily need a rebase; it might be better off dropped entirely instead.
Patch2: glib2-cast.patch
# PATCH-FIX-UPSTREAM glib2-allocsize.patch bgo523019 meissner@suse.de -- marks malloc-style functions to detect memory problems at compile time
Patch3: glib2-allocsize.patch
-# PATCH-FIX-UPSTREAM glib2-bnc373149-bgo518160-gbookmark-optimizations.diff bnc373149 bgo518160 federico@novell.com - backport GBookmark optimizations (1)
+# PATCH-FIX-UPSTREAM glib2-bnc373149-bgo518160-gbookmark-optimizations.diff bnc373149 bgo518160 federico@novell.com -- backport GBookmark optimizations (1)
Patch4: glib2-bnc373149-bgo518160-gbookmark-optimizations.diff
-# PATCH-FIX-UPSTREAM glib2-bnc373149-bgo523877-gbookmark-optimizations.diff bnc373149 bgo523877 federico@novell.com - backport GBookmark optimizations (2)
+# PATCH-FIX-UPSTREAM glib2-bnc373149-bgo523877-gbookmark-optimizations.diff bnc373149 bgo523877 federico@novell.com -- backport GBookmark optimizations (2)
Patch5: glib2-bnc373149-bgo523877-gbookmark-optimizations.diff
# PATCH-FIX-UPSTREAM glib2-libtool.diff schwab@suse.de -- apparently configure.in is invoking libtool in a bad way
Patch6: glib2-libtool.diff
+# PATCH-FIX-UPSTREAM glib2-fix-bookmark-leak.diff federico@novell.com -- Don't leak apps_by_name in GBookmarkFile metadata items
+Patch7: glib2-fix-bookmark-leak.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: %{name}-lang = %{version}
# For temporary %%pre script only.
@@ -81,7 +83,7 @@
Summary: Definition of GNOME Default Applications
Group: Development/Libraries/C and C++
Provides: %{name}-branding = %{version}
-Conflicts: %{name}-branding
+Supplements: packageand(branding-upstream:%{name})
#BRAND: The /etc/gnome_defaults.conf allows to define arbitrary
#BRAND: applications as preferred defaults.
# NOTE: gnome_defaults is not an upstream feature, but a SuSE
@@ -117,6 +119,7 @@
Sebastian Wilhelmi