Hello community,
here is the log from the commit of package glib2-branding-openSUSE for
openSUSE:Factory
checked in at Fri Jul 8 10:15:53 CEST 2011.
--------
--- GNOME/glib2-branding-openSUSE/glib2-branding-openSUSE.changes
2011-01-14 16:03:27.000000000 +0100
+++
/mounts/work_src_done/STABLE/glib2-branding-openSUSE/glib2-branding-openSUSE.changes
2011-07-07 11:36:31.000000000 +0200
@@ -1,0 +2,63 @@
+Thu Jul 7 11:35:18 CEST 2011 - [email protected]
+
+- Change GSettings default:
+ + org.gnome.shell/favorite-apps: set to [ 'firefox.desktop',
+ 'evolution.desktop', 'empathy.desktop', 'banshee.desktop',
+ 'shotwell.desktop', 'writer.desktop', 'nautilus.desktop' ]
+ + this enables us to drop default-applications.patch from
+ gnome-shell.
+ + fix bnc#689610.
+
+-------------------------------------------------------------------
+Wed Jul 6 22:51:42 CEST 2011 - [email protected]
+
+- Change GSettings defaults:
+ + org.freedesktop.Tracker.Miner.Files/index-removable-devices:
+ set to false (so we can remove
+ tracker-removeable-media-off.patch from the tracker package)
+ + org.gnome.eog.ui/external-editor: set to gimp.desktop, since we
+ want to use GIMP as default there.
+
+-------------------------------------------------------------------
+Wed Jul 6 22:09:05 CEST 2011 - [email protected]
+
+- Rework the package to only build the openSUSE branding package,
+ or the SLE branding packages, but not all of them at once. Use a
+ %build_for_openSUSE define for that, which is used to also define
+ a %build_for_SLE helper.
+- Create gio-branding-{openSUSE,SLED,SLES} subpackages, and do not
+ create glib2-branding-{openSUSE,SLED,SLES} subpackages anymore:
+ the data we add here is related only to gio, not to the whole
+ glib.
+- The gio-branding-{openSUSE,SLED,SLES} subpackage have appropriate
+ Provides/Obsoletes for glib2-branding-{openSUSE,SLED,SLES}, to
+ enable smooth upgrades.
+- Update glib2-branding-openSUSE-gnome_defaults.conf to define
+ default handlers for URI schemes (after migration of this
+ settings from gconf to the MIME system):
+ + Add firefox.desktop as default handler for
+ x-scheme-handler/{http,https,ftp}
+ + Add evolution.desktop as default handler for
+ x-scheme-handler/mailto
+ + Add yelp.desktop as default handler for all MIME types it
+ handles (ie, the help-related URI schemes)
+- Add default values for GSettings schemas:
+ + Add glib2-branding.gschema.override.in file. This file is
+ populated with default values based on the old gconf2-branding
+ package.
+ + Process glib2-branding.gschema.override.in in %install to
+ correctly define the wallpaper, and remove
+ openSUSE/SLE-specific defaults.
+ + Change glib2 BuildRequires to glib2-devel, since we need the
+ %glib2_gsettings_schema_* macros.
+ + Create post/postun scripts for all packages, using the
+ %glib2_gsettings_schema_post(un) macros.
+ + This fixes bnc#676301 and bnc#687780.
+- Add Requires for desktop-data-{openSUSE,SLED} to
+ gio-branding-{openSUSE,SLED,SLES} to make sure the wallpaper is
+ installed.
+- Bump version to 12.1.
+- Update summary and description.
+- Add Url tag.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
glib2-branding.gschema.override.in
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ glib2-branding-openSUSE.spec ++++++
--- /var/tmp/diff_new_pack.4TQVMs/_old 2011-07-08 09:51:10.000000000 +0200
+++ /var/tmp/diff_new_pack.4TQVMs/_new 2011-07-08 09:51:10.000000000 +0200
@@ -17,88 +17,187 @@
# norootforbuild
+%define build_for_openSUSE 1
+
+%if %{build_for_openSUSE}
+%define build_for_SLE 0
+%else
+%define build_for_SLE 1
+%endif
+
+%if %{build_for_openSUSE}
+%define desktop_data openSUSE
+%define desktop_data_ver 11.4
+%define wallpaper_file openSUSE-default.xml
+%endif
+%if %{build_for_SLE}
+%define desktop_data SLED
+%define desktop_data_ver 11
+%define wallpaper_file SLED110-1600x1200.png
+%endif
Name: glib2-branding-openSUSE
-Version: 11.4
-Release: 7
+Version: 12.1
+Release: 1
Group: System/GUI/GNOME
License: BSD3c
-Summary: Definition of GNOME Default Applications
+Summary: General-Purpose Utility Library -- openSUSE default
configuration
+Url: http://www.gtk.org/
Source: %{name}-gnome_defaults.conf
Source1: %{name}-COPYING
+Source2: glib2-branding.gschema.override.in
+BuildRequires: desktop-data-%{desktop_data}
+BuildRequires: glib2-devel
# We need glib2-branding-upstream else, the call to SuSEconfig.glib2 fails
-BuildRequires: glib2
BuildRequires: glib2-branding-upstream
-%define glib2_real_package %(rpm -q --whatprovides glib2)
-%define glib2_version %(rpm -q --qf '%%{version}-%%{release}'
%{glib2_real_package})
-Provides: glib2-branding = %{glib2_version}
-Conflicts: otherproviders(glib2-branding)
-Supplements: packageand(glib2:branding-openSUSE)
+%define gio_real_package %(rpm -q --qf '%%{name}' --whatprovides gio)
+%define gio_version %(rpm -q --qf '%%{version}-%%{release}'
%{gio_real_package})
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
%description
-This branding-style package sets default applications in GNOME in
-openSUSE.
-
+This package provides openSUSE defaults for settings stored with
+GSettings and applications used by the MIME system.
+%if %{build_for_openSUSE}
-%package -n glib2-branding-SLED
+%package -n gio-branding-openSUSE
License: BSD3c
Group: System/GUI/GNOME
-Summary: Definition of GNOME Default Applications
-Provides: glib2-branding = %{glib2_version}
-Conflicts: otherproviders(glib2-branding)
-Supplements: packageand(glib2:branding-SLED)
-
-%description -n glib2-branding-SLED
-This branding-style package sets default applications in GNOME in
-openSUSE.
+Summary: openSUSE definitions of default settings and applications
+# For wallpaper
+Requires: desktop-data-%{desktop_data} = %{desktop_data_ver}
+Provides: glib2-branding-openSUSE = %{version}
+Obsoletes: glib2-branding-openSUSE < %{version}
+Requires: %{gio_real_package} = %{gio_version}
+Provides: gio-branding = %{gio_version}
+Conflicts: otherproviders(gio-branding)
+Supplements: packageand(%{gio_real_package}:branding-openSUSE)
+%glib2_gsettings_schema_requires
+
+%description -n gio-branding-openSUSE
+This package provides openSUSE defaults for settings stored with
+GSettings and applications used by the MIME system.
+%endif
+%if %{build_for_SLE}
-
-%package -n glib2-branding-SLES
+%package -n gio-branding-SLED
License: BSD3c
Group: System/GUI/GNOME
-Summary: Definition of GNOME Default Applications
-Provides: glib2-branding = %{glib2_version}
-Conflicts: otherproviders(glib2-branding)
-Supplements: packageand(glib2:branding-SLES)
-
-%description -n glib2-branding-SLES
-This branding-style package sets default applications in GNOME in
-openSUSE.
-
+Summary: SLED definitions of default settings and applications
+# For wallpaper
+Requires: desktop-data-%{desktop_data} = %{desktop_data_ver}
+Provides: glib2-branding-SLED = %{version}
+Obsoletes: glib2-branding-SLED < %{version}
+Requires: %{gio_real_package} = %{gio_version}
+Provides: gio-branding = %{gio_version}
+Conflicts: otherproviders(gio-branding)
+Supplements: packageand(%{gio_real_package}:branding-SLED)
+%glib2_gsettings_schema_requires
+
+%description -n gio-branding-SLED
+This package provides SLED defaults for settings stored with
+GSettings and applications used by the MIME system.
+%package -n gio-branding-SLES
+License: BSD3c
+Group: System/GUI/GNOME
+Summary: SLES definitions of default settings and applications
+# For wallpaper
+Requires: desktop-data-%{desktop_data} = %{desktop_data_ver}
+Provides: glib2-branding-SLES = %{version}
+Obsoletes: glib2-branding-SLES < %{version}
+Requires: %{gio_real_package} = %{gio_version}
+Provides: gio-branding = %{gio_version}
+Conflicts: otherproviders(gio-branding)
+Supplements: packageand(%{gio_real_package}:branding-SLES)
+%glib2_gsettings_schema_requires
+
+%description -n gio-branding-SLES
+This package provides SLES defaults for settings stored with
+GSettings and applications used by the MIME system.
+%endif
%prep
%setup -q -T -c %{name}-%{version}
-cp -a %{S:0} gnome_defaults.conf
-cp -a %{S:1} COPYING
+cp -a %{SOURCE0} gnome_defaults.conf
+cp -a %{SOURCE1} COPYING
+cp -a %{SOURCE2} glib2-branding.gschema.override.in
%build
+test -f %{_datadir}/wallpapers/%{wallpaper_file}
+sed "s,@@WALLPAPER_URI@@,file:///usr/share/wallpapers/%{wallpaper_file},"
glib2-branding.gschema.override.in > glib2-branding.gschema.override
+#for ephy homepage + sound theme
+%if %{build_for_openSUSE}
+sed "s:@@IF_openSUSE@@::g" < glib2-branding.gschema.override | grep -v ^@@IF_
> openSUSE-branding.gschema.override
+%endif
+%if %{build_for_SLE}
+sed "s:@@IF_SLE@@::g;s:@@IF_SLED@@::g" < glib2-branding.gschema.override |
grep -v ^@@IF_ > SLED-branding.gschema.override
+sed "s:@@IF_SLE@@::g;s:@@IF_SLES@@::g" < glib2-branding.gschema.override |
grep -v ^@@IF_ > SLES-branding.gschema.override
+%endif
%install
-install -d $RPM_BUILD_ROOT%{_sysconfdir}
-install -m0644 gnome_defaults.conf $RPM_BUILD_ROOT%{_sysconfdir}/
+install -d %{buildroot}%{_sysconfdir}
+install -m0644 gnome_defaults.conf %{buildroot}%{_sysconfdir}/
+install -d %{buildroot}%{_datadir}/glib-2.0/schemas
+%if %{build_for_openSUSE}
+install -m0644 openSUSE-branding.gschema.override
%{buildroot}%{_datadir}/glib-2.0/schemas/
+%endif
+%if %{build_for_SLE}
+install -m0644 SLED-branding.gschema.override
%{buildroot}%{_datadir}/glib-2.0/schemas/
+install -m0644 SLES-branding.gschema.override
%{buildroot}%{_datadir}/glib-2.0/schemas/
+%endif
%clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
+
+%if %{build_for_openSUSE}
+
+%post -n gio-branding-openSUSE
+%glib2_gsettings_schema_post
-%files
+%postun -n gio-branding-openSUSE
+%glib2_gsettings_schema_postun
+%endif
+
+%if %{build_for_SLE}
+
+%post -n gio-branding-SLED
+%glib2_gsettings_schema_post
+
+%postun -n gio-branding-SLED
+%glib2_gsettings_schema_postun
+
+%post -n gio-branding-SLES
+%glib2_gsettings_schema_post
+
+%postun -n gio-branding-SLES
+%glib2_gsettings_schema_postun
+%endif
+
+%if %{build_for_openSUSE}
+
+%files -n gio-branding-openSUSE
%defattr (-, root, root)
%doc COPYING
%config (noreplace) %{_sysconfdir}/gnome_defaults.conf
-# Clone exactly the same defaults for SLED and SLES:
+%{_datadir}/glib-2.0/schemas/openSUSE-branding.gschema.override
+%endif
+
+%if %{build_for_SLE}
-%files -n glib2-branding-SLED
+%files -n gio-branding-SLED
%defattr (-, root, root)
%doc COPYING
%config (noreplace) %{_sysconfdir}/gnome_defaults.conf
+%{_datadir}/glib-2.0/schemas/SLED-branding.gschema.override
-%files -n glib2-branding-SLES
+%files -n gio-branding-SLES
%defattr (-, root, root)
%doc COPYING
%config (noreplace) %{_sysconfdir}/gnome_defaults.conf
+%{_datadir}/glib-2.0/schemas/SLES-branding.gschema.override
+%endif
%changelog
++++++ glib2-branding-openSUSE-gnome_defaults.conf ++++++
--- /var/tmp/diff_new_pack.4TQVMs/_old 2011-07-08 09:51:10.000000000 +0200
+++ /var/tmp/diff_new_pack.4TQVMs/_new 2011-07-08 09:51:10.000000000 +0200
@@ -29,6 +29,14 @@
# Use xxx as default for mime/type (see 3.1):
# mime/type=xxx.desktop
+# URI schemes
+x-scheme-handler/http=firefox.desktop
+x-scheme-handler/https=firefox.desktop
+x-scheme-handler/ftp=firefox.desktop
+x-scheme-handler/mailto=evolution.desktop
+# All URI schemes declared by yelp
+yelp.desktop
+
# Prefer banshee for multimedia where possible
!banshee-1.desktop
++++++ glib2-branding.gschema.override.in ++++++
[org.gnome.desktop.interface]
## No accessibility by default, until we're 100% there's no regression
toolkit-accessibility = false
### For the theme, we stay with the defaults
## Note: for non-GNOME sessions, the cursor theme is defined in
/var/adm/fillup-templates/sysconfig.windowmanager-desktop-data-openSUSE from
desktop-data-openSUSE
# cursor-theme = ""
## Note: gtk[23]-branding-%{branding_name} must contain the same defaults for
icon and gtk, otherwise the theme will change when gnome-settings-daemon starts
# icon-theme = ""
# gtk-theme = ""
[org.gnome.desktop.background]
## Default wallpaper
picture-uri = "@@WALLPAPER_URI@@"
picture-options = "stretched"
primary-color = "#258c06"
secondary-color = "#258c06"
[org.gnome.libgnomekbd.desktop]
## Set keyboard layout global per session instead of per window
group-per-window = false
[org.gnome.nautilus.preference]
## Never preview sounds when mousing over an icon
preview-sound = "never"
[org.gnome.desktop.sound]
## Make sure to have event sounds by default
event-sounds = true
@@IF_openSUSE@@# theme-name = ""
@@IF_SLE@@theme-name = "novell"
[org.gnome.settings-daemon.plugins.power]
## Enable Energy Star compliant default configuration
sleep-display-ac = 300
sleep-inactive-battery-type = "suspend"
## To complete Energy Star compliant default configuration, you should enable
this too:
## (disabled by default because suspending is not working fine in all cases)
# sleep-inactive-ac = true
# sleep-inactive-ac-timeout = 1200
# sleep-inactive-battery = true
# sleep-inactive-battery-timeout = 1200
[org.gnome.settings-daemon.plugins.xsettings]
## the PackageKit gtk+ module is too spammy, fdo#23917
disabled-gtk-modules = [ "pk-gtk-module" ]
[org.gnome.settings-daemon.plugins.media-keys]
help = "XF86Help"
[org.gnome.shell]
## Default apps shown in the gnome-shell dash
favorite-apps = [ 'firefox.desktop', 'evolution.desktop', 'empathy.desktop',
'banshee.desktop', 'shotwell.desktop', 'writer.desktop', 'nautilus.desktop' ]
[org.gnome.power-manager]
## Depend on gnome-power-manager-notify-idle-sleep.patch in g-p-m
notify-idle-sleep = true
[org.gnome.Epiphany]
## Change epiphany homepage
@@IF_SLE@@homepage-url = "http://www.novell.com/linux/11/";
@@IF_openSUSE@@homepage-url = "http://www.opensuse.org/";
[org.gnome.gnome-panel.applet.window-list]
## Display all workspaces in the gnome-panel window list applet
display-all-workspaces = true
[org.freedesktop.Tracker.Miner.Files]
## Disable indexing on removable media
index-removable-devices = false
[org.gnome.eog.ui]
## External editor to use when editing image
external-editor = "gimp.desktop"
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
