pool/gnome-session
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 163894 from home:dimstar:branches:GNOME:Factory

Browse Source 
- 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).

- 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.

OBS-URL: https://build.opensuse.org/request/show/163894
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-session?expand=0&rev=174
This commit is contained in:
Dominique Leuenberger 2013-04-13 16:09:44 +00:00 committed by Git OBS Bridge
parent 4e06ce6f9d
commit 570d607362
3 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gnome
View File

@ -88,4 +88,9 @@ fi
# Uncomment after SLED12, remove after SLED14:
#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} $*

15
gnome-session.changes
View File

@ -1,3 +1,18 @@
-------------------------------------------------------------------
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

19
gnome-session.spec
View File

@ -73,6 +73,8 @@ Obsoletes: gnome-session-gtk1-support <= 2.31
Obsoletes: gnome-session-splash <= 2.31
# the fallback session was dropped in gnome 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
%description
@ -89,15 +91,6 @@ Requires: gnome-shell
%description default-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
Summary: Session Manager for GNOME -- Minimal Version
Group: System/GUI/GNOME
@ -140,12 +133,8 @@ install -d -m755 %{buildroot}%{_bindir}
install -m755 %SOURCE1 %{buildroot}%{_bindir}/gnome
install -d -m755 %{buildroot}%{_datadir}/xsessions
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 %{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}
%fdupes %{buildroot}
@ -184,10 +173,6 @@ rm -rf %{buildroot}
%{_datadir}/gnome-session/sessions/gnome.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
%defattr (-, root, root)
%doc AUTHORS COPYING ChangeLog NEWS README