Accepting request 535094 from home:xiaoguang_wang:branches:GNOME:Factory

- Add sle-classic-xorg.desktop file.
  Allow user to open X session or wayland session (bsc#1062909).
- Add default.desktop file in '{_datadir}/wayland-sessions/'
  Make default.desktop session working on wayland (bsc#1062196).

- Update gnome-shell-add-app-to-desktop.patch, allow app
  shortcut added to desktop could be executed with default

OBS-URL: https://build.opensuse.org/request/show/535094
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-shell-extensions?expand=0&rev=145
This commit is contained in:
Dominique Leuenberger 2017-10-20 14:36:27 +00:00 committed by Git OBS Bridge
parent 8c593644bf
commit 2c22c2467c
3 changed files with 163 additions and 2 deletions

View File

@ -1,8 +1,16 @@
-------------------------------------------------------------------
Wed Oct 18 02:59:02 UTC 2017 - xwang@suse.com
- Add sle-classic-xorg.desktop file.
Allow user to open X session or wayland session (bsc#1062909).
- Add default.desktop file in '{_datadir}/wayland-sessions/'
Make default.desktop session working on wayland (bsc#1062196).
-------------------------------------------------------------------
Tue Oct 17 06:38:09 UTC 2017 - qzheng@suse.com
- Update gnome-shell-add-app-to-desktop.patch, allow app
shortcut added to desktop could be executed with default
- Update gnome-shell-add-app-to-desktop.patch, allow app
shortcut added to desktop could be executed with default
attribute "trusted" (bsc#1055240).
-------------------------------------------------------------------

View File

@ -29,6 +29,7 @@ Source: http://download.gnome.org/sources/gnome-shell-extensions/3.26/%{
Source1: README.SUSE
Source2: sle-classic.desktop
Source3: SLE-theme.tar.gz
Source4: sle-classic-xorg.desktop
# PATCH-FEATURE-SLE gnome-shell-add-app-to-desktop.patch bnc#870580 dliang@suse.com -- allow adding app shortcut to desktop easily.
Patch1: gnome-shell-add-app-to-desktop.patch
# PATCH-FEATURE-SLE sle-classic-favorites-menu-at-end.patch bnc#890989 cxiong@suse.com -- put the favorites at the end of the app catogories for accessibility reason -- cxiong@suse.com bnc#890989
@ -126,6 +127,7 @@ make %{?_smp_mflags}
%find_lang %{name} %{?no_lang_C}
%if !0%{?is_opensuse}
install -m0644 %{SOURCE2} %{buildroot}/%{_datadir}/xsessions/sle-classic.desktop
install -m0644 %{SOURCE4} %{buildroot}/%{_datadir}/xsessions/sle-classic-xorg.desktop
install -d -m755 %{buildroot}%{_datadir}/wayland-sessions
install -m0644 %{SOURCE2} %{buildroot}/%{_datadir}/wayland-sessions/sle-classic.desktop
# Install SLE theme
@ -137,16 +139,22 @@ cp SLE-theme/theme/* %{buildroot}%{_datadir}/gnome-shell/theme
mkdir -p %{buildroot}%{_sysconfdir}/alternatives
touch %{buildroot}%{_sysconfdir}/alternatives/default-xsession.desktop
ln -s %{_sysconfdir}/alternatives/default-xsession.desktop %{buildroot}%{_datadir}/xsessions/default.desktop
touch %{buildroot}%{_sysconfdir}/alternatives/default-waylandsession.desktop
ln -s %{_sysconfdir}/alternatives/default-waylandsession.desktop %{buildroot}%{_datadir}/wayland-sessions/default.desktop
%endif
%if !0%{?is_opensuse}
%post -n gnome-shell-classic
%{_sbindir}/update-alternatives --install %{_datadir}/xsessions/default.desktop \
default-xsession.desktop %{_datadir}/xsessions/sle-classic.desktop 30
%{_sbindir}/update-alternatives --install %{_datadir}/wayland-sessions/default.desktop \
default-waylandsession.desktop %{_datadir}/wayland-sessions/sle-classic.desktop 30
%postun -n gnome-shell-classic
[ -f %{_datadir}/xsessions/sle-classic.desktop ] || %{_sbindir}/update-alternatives \
--remove default-xsession.desktop %{_datadir}/xsessions/sle-classic.desktop
[ -f %{_datadir}/wayland-sessions/sle-classic.desktop ] || %{_sbindir}/update-alternatives \
--remove default-waylandsession.desktop %{_datadir}/wayland-sessions/sle-classic.desktop
%endif
%files common
@ -182,10 +190,13 @@ ln -s %{_sysconfdir}/alternatives/default-xsession.desktop %{buildroot}%{_datadi
%if !0%{?is_opensuse}
%{_datadir}/xsessions/default.desktop
%{_datadir}/xsessions/sle-classic.desktop
%{_datadir}/xsessions/sle-classic-xorg.desktop
%dir %{_datadir}/wayland-sessions
%{_datadir}/wayland-sessions/default.desktop
%{_datadir}/wayland-sessions/sle-classic.desktop
%{_datadir}/gnome-shell/theme/sle-background.png
%ghost %{_sysconfdir}/alternatives/default-xsession.desktop
%ghost %{_sysconfdir}/alternatives/default-waylandsession.desktop
%endif
%files common-lang -f %{name}.lang

142
sle-classic-xorg.desktop Normal file
View File

@ -0,0 +1,142 @@
[Desktop Entry]
Name=SLE Classic on Xorg
Name[af]=SLE Klassiek
Name[an]=SLE clasico
Name[ar]=جنوم تقليدية
Name[as]=SLE ি
Name[bg]=Класически SLE
Name[bn_IN]=SLE ি
Name[bs]=Klasični SLE
Name[ca]=SLE clàssic
Name[ca@valencia]=SLE clàssic
Name[cs]=SLE klasik
Name[da]=SLE Classic
Name[de]=SLE Classic
Name[el]=SLE Classic
Name[en_GB]=SLE Classic
Name[eo]=SLE-klasika
Name[es]=SLE clásico
Name[et]=Klassikaline SLE
Name[eu]=SLE Klasikoa
Name[fa]=گنوم کلاسیک
Name[fi]=Perinteinen Gnome
Name[fr]=SLE Classique
Name[fur]=SLE Classic
Name[gd]=SLE clasaigeach
Name[gl]=SLE clasico
Name[gu]=SLE િ
Name[he]=SLE קלסי
Name[hi]=SLE ि
Name[hu]=Klasszikus SLE
Name[id]=SLE Klasik
Name[is]=SLE Klassík
Name[it]=SLE classico
Name[ja]=SLE
Name[kk]=Классикалық SLE
Name[km]=SLE Classic
Name[kn]=SLE ಿ
Name[ko]=
Name[lt]=Klasikinis SLE
Name[lv]=Klasiskais SLE
Name[ml]= ി
Name[mr]=SLE ि
Name[ms]=SLE Klasik
Name[nb]=Klassisk SLE
Name[ne]=ि ि
Name[nl]=Gnome klassiek
Name[oc]=SLE Classic
Name[or]=SLE ି
Name[pa]= ਿ
Name[pl]=Klasyczne SLE
Name[pt]=SLE clássico
Name[pt_BR]=SLE Clássico
Name[ro]=SLE Clasic
Name[ru]=Классический SLE
Name[sk]=Klasické prostredie SLE
Name[sl]=Običajno namizje SLE
Name[sr]=Класичан Гном
Name[sr@latin]=Klasičan Gnom
Name[sv]=SLE Klassisk
Name[ta]=SLE ிி
Name[te]= ి
Name[tg]=SLE-и классикӣ
Name[th]=SLE
Name[tr]=SLE Klasik
Name[uk]=Класичний SLE
Name[vi]=SLE c đin
Name[zh_CN]=SLE
Name[zh_HK]=SLE Classic
Name[zh_TW]=SLE Classic
Comment=This session logs you into SLE Classic
Comment[af]=Hierdie sessie laat mens aanmeld by SLE Klassiek
Comment[an]=Ista sesión encieta lo SLE clasico
Comment[ar]=تولجك هذه الجلسة في جنوم التقليدية
Comment[as]= ি SLE ি
Comment[bg]=Работната среда изглежда като класическия SLE (2.x)
Comment[bn_IN]= SLE ি
Comment[bs]=Ova sesija vas prijavljuje na klasični SLE
Comment[ca]=Aquesta sessió us permet utilitzar el SLE clàssic
Comment[ca@valencia]=Esta sessió vos permet utilitzar el SLE clàssic
Comment[cs]=Toto sezení vás přihlásí do SLE klasik
Comment[da]=Denne session logger dig ind i SLE Classic
Comment[de]=Diese Sitzung meldet Sie in SLE Classic an
Comment[el]=Αυτή η συνεδρία σας συνδέει στο SLE Classic
Comment[en_GB]=This session logs you into SLE Classic
Comment[eo]=Ĉi seanco ensalutas vin SLE-klasiken
Comment[es]=Esta sesión inicia SLE clásico
Comment[et]=See on klassikalise SLE seanss
Comment[eu]=Saio honek SLE Klasikoa hasten du
Comment[fa]=این نشست شما را به گنوم کلاسیک وارد میکند
Comment[fi]=Tämä istunto kirjaa sinut perinteiseen Gnomeen
Comment[fr]=Cette session vous connnecte à SLE Classique
Comment[fur]=Cheste session a si invie cun SLE classic
Comment[gd]=Clàraidh an seisean seo a-steach gu SLE clasaigeach thu
Comment[gl]=Esta sesión iniciarao en SLE clásico
Comment[gu]= SLE િ
Comment[he]=הפעלה זו מכניסה אותך למצב הקלסי של SLE
Comment[hi]= ि
Comment[hu]=Bejelentkezés a klasszikus SLE környezetbe
Comment[id]=Sesi ini memasukkan Anda ke SLE Klasik
Comment[is]=Þessi seta skráir þig inn í klassískt SLE
Comment[it]=Questa sessione si avvia con SLE classico
Comment[ja]=SLE
Comment[kk]=Бұл сессия арқылы классикалық SLE ішіне кіресіз
Comment[km]= SLE Classic
Comment[kn]= ಿ ಿ SLE ಿ ಿ
Comment[ko]=
Comment[lt]=Šis seansas prijungs jus prie klasikinio SLE
Comment[lv]=Šī sesija ieraksta jūs klasiskajā SLE vidē
Comment[ml]= ി ിി
Comment[mr]= SLE ि
Comment[ms]=Sesi ini log masukkan anda ke SLE Klasik
Comment[nb]=Denne økten logger inn i klassisk SLE
Comment[ne]= ि ि
Comment[nl]=Deze sessie meldt u aan bij Gnome klassiek
Comment[oc]=Aquesta session vos connècta a SLE Classic
Comment[or]=ି ି SLE ି
Comment[pa]= ਿ ਿ
Comment[pl]=Ta sesja loguje do klasycznego środowiska SLE
Comment[pt]=Esta sessão liga-o ao SLE clássico
Comment[pt_BR]=Essa sessão se inicia como SLE Clássico
Comment[ro]=Această sesiune vă autentifică în SLE Clasic
Comment[ru]=Данный сеанс использует классический рабочий стол SLE
Comment[sk]=Táto relácia vás prihlási do klasického prostredia SLE
Comment[sl]=Seja omogoča prijavo v običajno namizje SLE.
Comment[sr]=Ова сесија вас пријављује у класичан Гном
Comment[sr@latin]=Ova sesija vas prijavljuje u klasičan Gnom
Comment[sv]=Denna session loggar in dig till SLE Klassisk
Comment[ta]= SLE ிிி ி
Comment[te]= ి ిి ి
Comment[tg]=Ин ҷаласа шуморо ба SLE-и классикӣ ворид мекунад
Comment[th]= SLE
Comment[tr]=Bu oturum, SLE Klasik sürümüne giriş yapmanızı sağlar.
Comment[uk]=Це сеанс входу в класичний SLE
Comment[vi]=Phiên làm vic này đăng nhp bn vào SLE C đin
Comment[zh_CN]=SLE
Comment[zh_HK]= SLE Classic
Comment[zh_TW]= SLE Classic
Exec=env GNOME_SHELL_SESSION_MODE=classic SLE_CLASSIC_MODE=1 gnome-session --session gnome-classic
TryExec=gnome-session
Icon=
Type=Application
DesktopNames=GNOME-Classic;GNOME