Accepting request 173251 from GNOME:Factory

Push GNOME 3.8.1 to Factory - mostly small bug fixes over the existing 3.8.0 we have

OBS-URL: https://build.opensuse.org/request/show/173251
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-session?expand=0&rev=134
This commit is contained in:
Stephan Kulow 2013-04-26 13:47:47 +00:00 committed by Git OBS Bridge
commit f9ee6af02e
5 changed files with 34 additions and 22 deletions

7
gnome
View File

@ -88,4 +88,9 @@ fi
# Uncomment after SLED12, remove after SLED14: # Uncomment after SLED12, remove after SLED14:
#rm -f ~/.skel/gnome2-run ~/.skel/gnome2-run-9.2 ~/.skel/sled10-run #rm -f ~/.skel/gnome2-run ~/.skel/gnome2-run-9.2 ~/.skel/sled10-run
exec /usr/bin/gnome-session $* # in case we want to start gnome-classic, we need to inject --session into the cmd line.
if [ "$1" == "gnome-classic" ]; then
session="--session"
fi
exec /usr/bin/gnome-session ${session} $*

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7892c4ef5049bf5f4ac75bc82b554c1c5f962249108c8467df1be0f947b5a99f
size 768856

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6c1cf3c0bc86da1dc5ec2d1a7bb3332b15652d4a468c52c5ae894b46b4a14770
size 771568

View File

@ -1,3 +1,25 @@
-------------------------------------------------------------------
Mon Apr 15 20:23:55 UTC 2013 - dimstar@opensuse.org
- Update to version 3.8.1:
+ Check for logind, not systemd (bgo#696262).
+ Updated translations.
-------------------------------------------------------------------
Sat Apr 13 15:44:32 UTC 2013 - dimstar@opensuse.org
- Modify gnome starter script: if the first parameter is
'gnome-classic', that means we want to start gnome-session with
--session gnome-classic (we need to inject --session into the
build command).
-------------------------------------------------------------------
Tue Apr 2 19:12:20 UTC 2013 - dimstar@opensuse.org
- Drop gnome2-look-and-feel package and obsolete it from the main
package. The replacement is called gnome-shell-classic and is
built by gnome-shell-extensions.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Mar 26 09:34:33 UTC 2013 - dimstar@opensuse.org Tue Mar 26 09:34:33 UTC 2013 - dimstar@opensuse.org

View File

@ -19,7 +19,7 @@
%define with_systemd 1 %define with_systemd 1
Name: gnome-session Name: gnome-session
Version: 3.8.0 Version: 3.8.1
Release: 0 Release: 0
Summary: Session Tools for the GNOME Desktop Summary: Session Tools for the GNOME Desktop
License: GPL-2.0+ License: GPL-2.0+
@ -73,6 +73,8 @@ Obsoletes: gnome-session-gtk1-support <= 2.31
Obsoletes: gnome-session-splash <= 2.31 Obsoletes: gnome-session-splash <= 2.31
# the fallback session was dropped in gnome 3.8. # the fallback session was dropped in gnome 3.8.
Obsoletes: gnome-session-fallback-session < 3.8 Obsoletes: gnome-session-fallback-session < 3.8
# Since GNOME 3.8.0, the 'classic' mode is provided by gnome-shell-extensions.
Obsoletes: gnome2-look-and-feel <= 3.8.0
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description %description
@ -89,15 +91,6 @@ Requires: gnome-shell
%description default-session %description default-session
This package contains the definition of the default GNOME session. This package contains the definition of the default GNOME session.
%package -n gnome2-look-and-feel
Summary: GNOME Desktop with the GNOME 2 Look and Feel
Group: System/GUI/GNOME
# TO BE DEFINED.. shoult require the correct classic extensions to make this up
%description -n gnome2-look-and-feel
This package contains the definition to choose in the display manager
a GNOME 3 session that looks and feels like GNOME 2.
%package core %package core
Summary: Session Manager for GNOME -- Minimal Version Summary: Session Manager for GNOME -- Minimal Version
Group: System/GUI/GNOME Group: System/GUI/GNOME
@ -140,12 +133,8 @@ install -d -m755 %{buildroot}%{_bindir}
install -m755 %SOURCE1 %{buildroot}%{_bindir}/gnome install -m755 %SOURCE1 %{buildroot}%{_bindir}/gnome
install -d -m755 %{buildroot}%{_datadir}/xsessions install -d -m755 %{buildroot}%{_datadir}/xsessions
install -m644 %SOURCE2 %{buildroot}%{_datadir}/xsessions/gnome.desktop install -m644 %SOURCE2 %{buildroot}%{_datadir}/xsessions/gnome.desktop
# Install a session file for gnome 2 look-and-feel (gnome3 with classic look and feel extensions)
install -m644 %{S:2} %{buildroot}%{_datadir}/xsessions/gnome2-look-and-feel.desktop
# FIXME: gnome2-look-and-feel.desktop needs to be corrected to know how to statr classic mode.
%suse_update_desktop_file session-properties X-SuSE-ControlCenter-Personal %suse_update_desktop_file session-properties X-SuSE-ControlCenter-Personal
%suse_update_desktop_file %{buildroot}%{_datadir}/xsessions/gnome.desktop %suse_update_desktop_file %{buildroot}%{_datadir}/xsessions/gnome.desktop
%suse_update_desktop_file -N "GNOME 2 Look and Feel" %{buildroot}%{_datadir}/xsessions/gnome2-look-and-feel.desktop
%find_lang %{name}-3.0 %{?no_lang_C} %find_lang %{name}-3.0 %{?no_lang_C}
%fdupes %{buildroot} %fdupes %{buildroot}
@ -184,10 +173,6 @@ rm -rf %{buildroot}
%{_datadir}/gnome-session/sessions/gnome.session %{_datadir}/gnome-session/sessions/gnome.session
%{_datadir}/gnome-session/sessions/gnome-dummy.session %{_datadir}/gnome-session/sessions/gnome-dummy.session
%files -n gnome2-look-and-feel
%defattr(-, root, root)
%{_datadir}/xsessions/gnome2-look-and-feel.desktop
%files core %files core
%defattr (-, root, root) %defattr (-, root, root)
%doc AUTHORS COPYING ChangeLog NEWS README %doc AUTHORS COPYING ChangeLog NEWS README