From 570d6073621c993634fc0663fb1f733e7ea068f423e7f8e9748750c5ffadc99e Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Sat, 13 Apr 2013 16:09:44 +0000 Subject: [PATCH 1/3] Accepting request 163894 from home:dimstar:branches:GNOME:Factory - 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 --- gnome | 7 ++++++- gnome-session.changes | 15 +++++++++++++++ gnome-session.spec | 19 ++----------------- 3 files changed, 23 insertions(+), 18 deletions(-) diff --git a/gnome b/gnome index 0fb9356..0f0903d 100644 --- a/gnome +++ b/gnome @@ -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} $* diff --git a/gnome-session.changes b/gnome-session.changes index 998171c..d567710 100644 --- a/gnome-session.changes +++ b/gnome-session.changes @@ -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 diff --git a/gnome-session.spec b/gnome-session.spec index 01b4738..3537aab 100644 --- a/gnome-session.spec +++ b/gnome-session.spec @@ -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 From c5b6d8c1226d3177a88ad493b54fdce88431a4b94b6ce4031aefa4c53ff27f81 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Sat, 13 Apr 2013 17:57:20 +0000 Subject: [PATCH 2/3] Minor fix... no spaces when assigning variables OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-session?expand=0&rev=175 --- gnome | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnome b/gnome index 0f0903d..e90daa7 100644 --- a/gnome +++ b/gnome @@ -90,7 +90,7 @@ fi # in case we want to start gnome-classic, we need to inject --session into the cmd line. if [ "$1" == "gnome-classic" ]; then - session = "--session" + session="--session" fi exec /usr/bin/gnome-session ${session} $* From 6e97057224f67ad3d2bd03016e653566439e8e4e5dd3c9ed3df4be86318b61f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Fri, 19 Apr 2013 09:38:12 +0000 Subject: [PATCH 3/3] Accepting request 171229 from home:dimstar:branches:GNOME:Factory Update to 3.8.1 OBS-URL: https://build.opensuse.org/request/show/171229 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-session?expand=0&rev=176 --- gnome-session-3.8.0.tar.xz | 3 --- gnome-session-3.8.1.tar.xz | 3 +++ gnome-session.changes | 7 +++++++ gnome-session.spec | 2 +- 4 files changed, 11 insertions(+), 4 deletions(-) delete mode 100644 gnome-session-3.8.0.tar.xz create mode 100644 gnome-session-3.8.1.tar.xz diff --git a/gnome-session-3.8.0.tar.xz b/gnome-session-3.8.0.tar.xz deleted file mode 100644 index 5cd1b1a..0000000 --- a/gnome-session-3.8.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7892c4ef5049bf5f4ac75bc82b554c1c5f962249108c8467df1be0f947b5a99f -size 768856 diff --git a/gnome-session-3.8.1.tar.xz b/gnome-session-3.8.1.tar.xz new file mode 100644 index 0000000..b03b5ae --- /dev/null +++ b/gnome-session-3.8.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6c1cf3c0bc86da1dc5ec2d1a7bb3332b15652d4a468c52c5ae894b46b4a14770 +size 771568 diff --git a/gnome-session.changes b/gnome-session.changes index d567710..9da2391 100644 --- a/gnome-session.changes +++ b/gnome-session.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +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 diff --git a/gnome-session.spec b/gnome-session.spec index 3537aab..5733e2a 100644 --- a/gnome-session.spec +++ b/gnome-session.spec @@ -19,7 +19,7 @@ %define with_systemd 1 Name: gnome-session -Version: 3.8.0 +Version: 3.8.1 Release: 0 Summary: Session Tools for the GNOME Desktop License: GPL-2.0+