OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/glib2?expand=0&rev=30

SuSEconfig.glib2

@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# Copyright (c) 2006 SuSE
+# Copyright (c) 2006, 2008 SuSE
 # Author: Stanislav Brabec <sbrabec@suse.cz>
 #
 # Creates defaults.list from gnome_defaults.conf using only available
@@ -20,8 +20,8 @@ fi
 # Read defaults.list and set applications as best candidates.
 exec <$r/etc/gnome_defaults.conf
 while read ; do
-    case "$REPLY" in 
+    case "$REPLY" in
-	"[Default Applications]" | "#"* | "" )
+	"#"* | "" )
 	    ;;
 	# Is is default application for particular MIME type?
 	*=* )
@@ -117,7 +117,7 @@ for DIR in ${XDG_DATA_DIRS:-/usr/local/share:/usr/share} ; do
 		IS_DEFAULT=true
 	    fi"
 	    if $IS_DEFAULT ; then
-		eval APP_DEFAULT_$MIMES\=\"\$DESKTOPN\"
+		eval APP_MIMEDEFAULT_$MIMES\=\"\$DESKTOPN\"
 	    else
 		eval APP_${APPTYPE}_$MIMES\=\"\$DESKTOPN\"
 	    fi
@@ -134,7 +134,7 @@ for MIMES in ${!MIME_*} ; do
     eval MIME\=\$$MIMES
     MIMES=${MIMES#MIME_}
     # Try GNOME applications first, then GTK, then generic.
-    for APPTYPE in PREFDEFAULT DEFAULT DEFDESKTOP GNOME GTK GENERIC ; do
+    for APPTYPE in MIMEDEFAULT PREFDEFAULT DEFAULT GNOME GTK GENERIC ; do
 	eval "if test \"\$APP_${APPTYPE}_$MIMES\" ; then
 	    echo \"$MIME=\$APP_${APPTYPE}_$MIMES\" ;
 	    break ;

glib2-upstream-gnome_defaults.conf

@@ -1,8 +1,14 @@
 # GNOME Default Applications Source
 # /etc/gnome-defaults.conf
 #
+# WARNING: This is a dumb file, which provides only upstream GNOME
+# packages as preferred defaults. You most probably don't want this
+# package!
+# You probably want to install distribution glib2-branding and prefer
+# distribution wise GNOME defaults.
+#
 # After any change of this file run
-# SuSEconfig --module gnome-vfs2
+# SuSEconfig --module glib2
 #
 # This list is a source for defaults.list.
 #
@@ -29,30 +35,9 @@
 # Use xxx as default for mime/type (see 3.1):
 # mime/type=xxx.desktop
 
-# Prefer banshee for multimedia where possible
+# Upstream GNOME default applications
-!banshee.desktop
-
-# Prefer contracted commercial applications
-!acroread.desktop
-realplay.desktop
-
-# Prefer Zen for handling packages
-!zen-installer.desktop
-
-# Nice GNOME default applications
 eog.desktop
 evince.desktop
 gedit.desktop
 file-roller.desktop
-
+epiphany.desktop
-# Firefox
-MozillaFirefox.desktop
-
-# OpenOffice
-base.desktop
-calc.desktop
-draw.desktop
-impress.desktop
-math.desktop
-web.desktop
-writer.desktop

glib2.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Tue Apr  8 16:39:01 CEST 2008 - sbrabec@suse.cz
+
+- Fixed support for default application for particular MIME type in
+  SuSEconfig.glib2.
+- Split gnome_defaults.conf to a separate branding-style package,
+  so branding vendors can easily change default applications.
+- Build FAM GIO module in a separate package to support remote FS
+  change notification without polling.
+- Own %{_libdir}/gio/modules directory.
+
 -------------------------------------------------------------------
 Fri Apr  4 16:18:40 CEST 2008 - maw@suse.de
 

glib2.spec

@@ -13,19 +13,20 @@
 
 Name:           glib2
 %define _name glib
-BuildRequires:  fdupes pcre-devel pkg-config
+BuildRequires:  fam-devel fdupes pcre-devel pkg-config
 License:        LGPL v2.1 or later
 Group:          Development/Libraries/C and C++
 AutoReqProv:    on
 Version:        2.16.1
-Release:        9
+Release:        11
 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
 Source1:        glib2.sh
 Source2:        glib2.csh
 Source3:        SuSEconfig.glib2
-Source4:        gnome_defaults.conf
+# Not upsteam file. Only proposes upstream packages:
+Source4:        glib2-upstream-gnome_defaults.conf
 # Not depending on gtk-doc shortens bootstrap compilation path.
 # Please update this file from the latest gtk-doc package:
 Source5:        gtk-doc.m4
@@ -48,6 +49,7 @@ PreReq:         coreutils
 PreReq:         /bin/sed
 # Conflicts with gnome_defaults.conf from gnome-vfs2 in 10.3
 Conflicts:      gnome-vfs2 < 2.22.0
+Requires:       %{name}-branding
 
 %description
 This library provides convenient functions, such as lists and hashes,
@@ -55,6 +57,46 @@ to a C programmer and is used by Gtk+ and GNOME.
 
 
 
+Authors:
+--------
+    Peter Mattis <petm@xcf.berkeley.edu>
+    Spencer Kimball <spencer@xcf.berkeley.edu>
+    Josh MacDonald <jmacd@xcf.berkeley.edu>
+    Shawn T. Amundson <amundson@gimp.org>
+    Jeff Garzik <jgarzik@pobox.com>
+    Raja R Harinath <harinath@cs.umn.edu>
+    Tim Janik <timj@gtk.org>
+    Elliot Lee <sopwith@redhat.com>
+    Tor Lillqvist <tml@iki.fi>
+    Paolo Molaro <lupus@debian.org>
+    Havoc Pennington <hp@pobox.com>
+    Manish Singh <yosh@gimp.org>
+    Owen Taylor <otaylor@gtk.org>
+    Sebastian Wilhelmi <wilhelmi@ira.uka.de>
+
+%package branding-upstream
+License:        LGPL v2.1 or later
+Summary:        Definition of GNOME Default Applications
+Group:          Development/Libraries/C and C++
+Provides:       %{name}-branding = %{version}
+Conflicts:      %{name}-branding
+#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
+# enhancement, but to conform branding conventions, the package is named
+# as glib2-branding-upstream.
+
+%description branding-upstream
+This branding-style package sets default applications in GNOME in
+openSUSE.
+
+This is a dumb package, which provides only upstream GNOME packages as
+preferred defaults. You most probably don't want this package. You
+probably want to install distribution default glib2-branding and prefer
+distribution wise GNOME defaults.
+
+
+
 Authors:
 --------
     Peter Mattis <petm@xcf.berkeley.edu>
@@ -184,6 +226,35 @@ to a C programmer and is used by Gtk+ and GNOME.
 
 
 
+Authors:
+--------
+    Peter Mattis <petm@xcf.berkeley.edu>
+    Spencer Kimball <spencer@xcf.berkeley.edu>
+    Josh MacDonald <jmacd@xcf.berkeley.edu>
+    Shawn T. Amundson <amundson@gimp.org>
+    Jeff Garzik <jgarzik@pobox.com>
+    Raja R Harinath <harinath@cs.umn.edu>
+    Tim Janik <timj@gtk.org>
+    Elliot Lee <sopwith@redhat.com>
+    Tor Lillqvist <tml@iki.fi>
+    Paolo Molaro <lupus@debian.org>
+    Havoc Pennington <hp@pobox.com>
+    Manish Singh <yosh@gimp.org>
+    Owen Taylor <otaylor@gtk.org>
+    Sebastian Wilhelmi <wilhelmi@ira.uka.de>
+
+%package -n libgio-fam
+License:        LGPL v2.1 or later
+Summary:        A Library with Convenient Functions Written in C
+Group:          Development/Libraries/C and C++
+Supplements:    packageand(libgio-2_0-0:fam)
+
+%description -n libgio-fam
+This library provides convenient functions, such as lists and hashes,
+to a C programmer and is used by Gtk+ and GNOME.
+
+
+
 Authors:
 --------
     Peter Mattis <petm@xcf.berkeley.edu>
@@ -297,7 +368,8 @@ Authors:
 %patch3
 %patch4 -p1
 %patch5 -p1
-cp -a %{S:1} %{S:2} %{S:3} %{S:4} .
+cp -a %{S:1} %{S:2} %{S:3} .
+cp -a %{S:4} gnome_defaults.conf
 if ! test -f %{_datadir}/aclocal/gtk-doc.m4 ; then
     cp -a %{S:5} m4macros/
 fi
@@ -322,9 +394,7 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/cache/gio-2.0 $RPM_BUILD_ROOT%{_datadi
 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
 chmod +x $RPM_BUILD_ROOT/%{_bindir}/gtester-report
-### cp -a %{S:1} $RPM_BUILD_ROOT/etc/profile.d/zzz-glib2.sh
+rm $RPM_BUILD_ROOT%{_libdir}/gio/modules/libgiofam.*a
-### cp -a %{S:2} $RPM_BUILD_ROOT/etc/profile.d/zzz-glib2.csh
-### chmod +x $RPM_BUILD_ROOT/%{_bindir}/gtester-report                              
 %find_lang %{_name}20
 %fdupes $RPM_BUILD_ROOT
 %posttrans
@@ -370,6 +440,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/defaults.list
 /etc/profile.d/zzz-glib2.*
 /sbin/conf.d/SuSEconfig.glib2
+%dir %{_libdir}/gio
+%dir %{_libdir}/gio/modules
+
+%files branding-upstream
+%defattr(-,root,root)
 %config (noreplace) %{_sysconfdir}/gnome_defaults.conf
 
 %files -n libglib-2_0-0
@@ -394,6 +469,10 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_localstatedir}/cache/gio-2.0
 %ghost %{_localstatedir}/cache/gio-2.0/defaults.list
 
+%files -n libgio-fam
+%defattr(-,root,root)
+%{_libdir}/gio/modules/libgiofam.so
+
 %files lang -f %{_name}20.lang
 
 %files devel
@@ -419,6 +498,14 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_datadir}/gtk-doc/html
 
 %changelog
+* Tue Apr 08 2008 sbrabec@suse.cz
+- Fixed support for default application for particular MIME type in
+  SuSEconfig.glib2.
+- Split gnome_defaults.conf to a separate branding-style package,
+  so branding vendors can easily change default applications.
+- Build FAM GIO module in a separate package to support remote FS
+  change notification without polling.
+- Own %%{_libdir}/gio/modules directory.
 * Fri Apr 04 2008 maw@suse.de
 - Merge the BETA and STABLE branches
 - Remove, pending further discussion, libgio-2_0-0's